ports/172503: devel/xxl: Update MASTER_SITES

[KATO Tsuguru]

>Number:         172503
>Category:       ports
>Synopsis:       devel/xxl: Update MASTER_SITES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 08 18:10:16 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Add regression-test

New file:
files/patch-xxl.c

Remove file:
files/patch-ltmain.sh

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/devel/xxl/Makefile devel/xxl/Makefile
--- /usr/ports/devel/xxl/Makefile	2011-10-24 12:33:01.000000000 +0900
+++ devel/xxl/Makefile	2012-10-07 15:33:38.000000000 +0900
@@ -1,35 +1,45 @@
-# Ports collection makefile for:        xxl
-# Date created:                         28 Aug 2003
-# Whom:                                 Robert Schlotterbeck <robert at rs.tarrant.tx.us>
-#
+# Created by: Robert Schlotterbeck <robert at rs.tarrant.tx.us>
 # $FreeBSD: ports/devel/xxl/Makefile,v 1.14 2011/10/24 03:33:01 stas Exp $
-#
 
 PORTNAME=	xxl
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.zork.org/software/
+MASTER_SITES=	http://launchpadlibrarian.net/39195019/ \
+		http://www.zork.org/software/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	C/C++ library for exception handling and asset management
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+OPTIONS_DEFINE=	THREADS DOCS
+OPTIONS_DEFAULT=THREADS
+
 USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
-.if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS=	--without-threads
-.endif
+PORTDOCS=	xxl.html xxl.pdf
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	xxl.pdf xxl.html
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTHREADS}
+COFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHERAD_LIBS}"
+.else
+CONFIGURE_ARGS+=--without-threads
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
 
+regression-test test: build
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} check)
+
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/xxl/files/patch-ltmain.sh devel/xxl/files/patch-ltmain.sh
--- /usr/ports/devel/xxl/files/patch-ltmain.sh	2003-08-29 20:50:08.000000000 +0900
+++ devel/xxl/files/patch-ltmain.sh	1970-01-01 09:00:00.000000000 +0900
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Fri Aug 29 13:31:36 2003
-+++ ltmain.sh	Fri Aug 29 13:31:59 2003
-@@ -5425,10 +5425,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -urN /usr/ports/devel/xxl/files/patch-xxl.c devel/xxl/files/patch-xxl.c
--- /usr/ports/devel/xxl/files/patch-xxl.c	1970-01-01 09:00:00.000000000 +0900
+++ devel/xxl/files/patch-xxl.c	2012-10-07 15:24:41.000000000 +0900
@@ -0,0 +1,11 @@
+--- xxl.c.orig	2004-12-22 03:42:52.000000000 -0600
++++ xxl.c	2008-01-17 13:25:18.000000000 -0600
+@@ -380,6 +380,8 @@
+             if (!tsd->contexts)
+                 die("XXL: Exception thrown with no handler to catch it!\n");
+             tsd->contexts->exception = *exception;
++			how=XXL_SETJMP_TRY;
++			tsd->contexts->state |= XXL_STATE_THROWN;
+             xxl_leave_handler(how);
+             return;
+     }
diff -urN /usr/ports/devel/xxl/pkg-descr devel/xxl/pkg-descr
--- /usr/ports/devel/xxl/pkg-descr	2003-08-29 20:50:08.000000000 +0900
+++ devel/xxl/pkg-descr	2012-10-07 15:17:48.000000000 +0900
@@ -1,11 +1,11 @@
 XXL is a library for C and C++ that provides exception handling and asset
 management. Asset management is integrated with the exception handling
 mechanism such that assets may be automatically cleaned up if an exception
-is thrown, which allows for much simplified program structure with respect to
-error handling.
+is thrown, which allows for much simplified program structure with respect
+to error handling.
 
-By allowing XXL to track assets and using its exception handling features, the
-programmer no longer has to check error conditions on every function call and
-cleanup the assets on failure because XXL does the work. 
+By allowing XXL to track assets and using its exception handling features,
+the programmer no longer has to check error conditions on every function
+call and cleanup the assets on failure because XXL does the work.
 
 WWW: http://www.zork.org/xxl/
>Release-Note:
>Audit-Trail:
>Unformatted: