Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Dec 2012 11:53:08 +0000 (UTC)
From:      Marcelo Araujo <araujo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308845 - in head/devel/xxl: . files
Message-ID:  <201212131153.qBDBr8Ld024324@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: araujo
Date: Thu Dec 13 11:53:08 2012
New Revision: 308845
URL: http://svnweb.freebsd.org/changeset/ports/308845

Log:
  - Update MASTER_SITES.
  - Add LICENSE.
  - Add MAKE_JOBS_SAFE.
  - Add regression-test.
  
  PR:		ports/172503
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Reviewed by:	myself

Added:
  head/devel/xxl/files/patch-xxl.c   (contents, props changed)
Deleted:
  head/devel/xxl/files/patch-ltmain.sh
Modified:
  head/devel/xxl/Makefile   (contents, props changed)
  head/devel/xxl/pkg-descr   (contents, props changed)

Modified: head/devel/xxl/Makefile
==============================================================================
--- head/devel/xxl/Makefile	Thu Dec 13 11:50:53 2012	(r308844)
+++ head/devel/xxl/Makefile	Thu Dec 13 11:53:08 2012	(r308845)
@@ -5,27 +5,40 @@ PORTNAME=	xxl
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://launchpadlibrarian.net/39195019/
+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
+
+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}
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+	PTHREAD_LIBS="${PTHREAD_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>

Added: head/devel/xxl/files/patch-xxl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/xxl/files/patch-xxl.c	Thu Dec 13 11:53:08 2012	(r308845)
@@ -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;
+     }

Modified: head/devel/xxl/pkg-descr
==============================================================================
--- head/devel/xxl/pkg-descr	Thu Dec 13 11:50:53 2012	(r308844)
+++ head/devel/xxl/pkg-descr	Thu Dec 13 11:53:08 2012	(r308845)
@@ -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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212131153.qBDBr8Ld024324>