Attachment #128646 for bug #172503




PORTVERSION=	1.0.1
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://launchpadlibrarian.net/39195019/ \
		http://www.zork.org/software/

MAINTAINER=	ports@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

PORTDOCS=	xxl.html xxl.pdf
CONFIGURE_ARGS=	--without-threads
.endif

.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 ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${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>




--- 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"

Line 0 Link Here

(-)devel/xxl/files/patch-xxl.c (+11 lines)
	1	--- xxl.c.orig 2004-12-22 03:42:52.000000000 -0600
	2	+++ xxl.c 2008-01-17 13:25:18.000000000 -0600
	3	@@ -380,6 +380,8 @@
	4	if (!tsd->contexts)
	5	die("XXL: Exception thrown with no handler to catch it!\n");
	6	tsd->contexts->exception = *exception;
	7	+ how=XXL_SETJMP_TRY;
	8	+ tsd->contexts->state \|= XXL_STATE_THROWN;
	9	xxl_leave_handler(how);
	10	return;
	11	}

Lines 1-11 Link Here

(-)devel/xxl/pkg-descr (-5 / +5 lines)
1	XXL is a library for C and C++ that provides exception handling and asset	1	XXL is a library for C and C++ that provides exception handling and asset
2	management. Asset management is integrated with the exception handling	2	management. Asset management is integrated with the exception handling
3	mechanism such that assets may be automatically cleaned up if an exception	3	mechanism such that assets may be automatically cleaned up if an exception
4	is thrown, which allows for much simplified program structure with respect to	4	is thrown, which allows for much simplified program structure with respect
5	error handling.	5	to error handling.
6		6
7	By allowing XXL to track assets and using its exception handling features, the	7	By allowing XXL to track assets and using its exception handling features,
8	programmer no longer has to check error conditions on every function call and	8	the programmer no longer has to check error conditions on every function
9	cleanup the assets on failure because XXL does the work.	9	call and cleanup the assets on failure because XXL does the work.
10		10
11	WWW: http://www.zork.org/xxl/	11	WWW: http://www.zork.org/xxl/

Return to bug 172503

Lines 5-34 Link Here

(-)devel/xxl/Makefile (-11 / +22 lines)
5	PORTVERSION= 1.0.1	5	PORTVERSION= 1.0.1
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://www.zork.org/software/	8	MASTER_SITES= http://launchpadlibrarian.net/39195019/ \
		9	http://www.zork.org/software/
9		10
10	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
11	COMMENT= C/C++ library for exception handling and asset management	12	COMMENT= C/C++ library for exception handling and asset management
12		13
13	DEPRECATED= No more public distfiles	14	LICENSE= BSD
14	EXPIRATION_DATE= 2012-11-26	15	LICENSE_FILE= ${WRKSRC}/LICENSE
		16
		17	OPTIONS_DEFINE= THREADS DOCS
		18	OPTIONS_DEFAULT=THREADS
15		19
16	USE_AUTOTOOLS= libtool	20	USE_AUTOTOOLS= libtool
17	GNU_CONFIGURE= yes
18	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	MAKE_JOBS_SAFE= yes
19		23
20	.if defined(WITHOUT_THREADS)	24	PORTDOCS= xxl.html xxl.pdf
21	CONFIGURE_ARGS= --without-threads
22	.endif
23		25
24	.if !defined(NOPORTDOCS)	26	.include <bsd.port.options.mk>
25	PORTDOCS= xxl.pdf xxl.html	27
		28	.if ${PORT_OPTIONS:MTHREADS}
		29	COFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		30	PTHREAD_LIBS="${PTHERAD_LIBS}"
		31	.else
		32	CONFIGURE_ARGS+=--without-threads
26	.endif	33	.endif
27		34
28	post-install:	35	post-install:
29	.if !defined(NOPORTDOCS)	36	.if ${PORT_OPTIONS:MDOCS}
30	@${MKDIR} ${DOCSDIR}	37	@${MKDIR} ${DOCSDIR}
31	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/	38	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
32	.endif	39	.endif
33		40
		41	regression-test test: build
		42	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
		43	${MAKEFILE} ${MAKE_ARGS} check)
		44
34	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)devel/xxl/files/patch-ltmain.sh (-15 lines)
1	--- ltmain.sh.orig Fri Aug 29 13:31:36 2003
2	+++ ltmain.sh Fri Aug 29 13:31:59 2003
3	@@ -5425,10 +5425,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false ; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"