diff options
| author | johans <johans@FreeBSD.org> | 2014-01-06 04:03:21 +0800 |
|---|---|---|
| committer | johans <johans@FreeBSD.org> | 2014-01-06 04:03:21 +0800 |
| commit | a38201eb05229031f6c556055b23e880504c8e97 (patch) | |
| tree | 00aa0613243eef883c1f5546070b1c9400d2683a | |
| parent | 71523a2f1bd783b361d38627f616ab0149e752c3 (diff) | |
| download | freebsd-ports-gnome-a38201eb05229031f6c556055b23e880504c8e97.tar.gz freebsd-ports-gnome-a38201eb05229031f6c556055b23e880504c8e97.tar.zst freebsd-ports-gnome-a38201eb05229031f6c556055b23e880504c8e97.zip | |
- Update SWI Prolog to 6.6.1 (bugfix release)
- Simplify options check
| -rw-r--r-- | lang/swi-pl/Makefile | 15 | ||||
| -rw-r--r-- | lang/swi-pl/distinfo | 4 | ||||
| -rw-r--r-- | lang/swi-pl/pkg-plist | 1 |
3 files changed, 7 insertions, 13 deletions
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 5a060f7a8930..a8c93ac76054 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= swi-pl -PORTVERSION= 6.6.0 +PORTVERSION= 6.6.1 CATEGORIES= lang MASTER_SITES= http://www.swi-prolog.org/download/stable/src/ DISTNAME= pl-${PORTVERSION} @@ -13,9 +13,12 @@ COMMENT= Edinburgh-style Prolog compiler LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libjpeg.so:${PORTSDIR}/graphics/jpeg +# note that the ports unixodbc and libiodbc conflict OPTIONS_SINGLE= ODBC OPTIONS_SINGLE_ODBC= IODBC UNIXODBC OPTIONS_DEFAULT=UNIXODBC +UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -35,20 +38,12 @@ MAKE_ARGS= DISABLE_PKGS=jpl \ SHEBANG_LANG= swipl swipl_OLD_CMD= /usr/bin/swipl -swipl_CMD= ${LOCALBASE}/bin/swipl +swipl_CMD= ${LOCALBASE}/bin/swipl SHEBANG_FILES= library/dialect/sicstus/swipl-lfr.pl \ packages/http/examples/demo_inetd PLIST_SUB= DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:L} -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -.else -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -.endif - .include <bsd.port.pre.mk> .if (${ARCH} == "i386" || ${ARCH} == "powerpc") diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo index ae170763296a..78be9a311cef 100644 --- a/lang/swi-pl/distinfo +++ b/lang/swi-pl/distinfo @@ -1,2 +1,2 @@ -SHA256 (pl-6.6.0.tar.gz) = b85ac27a8afeb29640fe2b98c088e5f9c753adacb20114f8c10ba4835b26f9cd -SIZE (pl-6.6.0.tar.gz) = 14764935 +SHA256 (pl-6.6.1.tar.gz) = c8bf201dc28705969e509a378661534ab4b87e1f4ab598ee01293409cc3f6b0c +SIZE (pl-6.6.1.tar.gz) = 14769033 diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist index 9079e98e9291..b7ba20efa47a 100644 --- a/lang/swi-pl/pkg-plist +++ b/lang/swi-pl/pkg-plist @@ -163,7 +163,6 @@ lib/%%DISTNAME%%/doc/Manual/moduleop.html lib/%%DISTNAME%%/doc/Manual/modules.html lib/%%DISTNAME%%/doc/Manual/mt-xpce.html lib/%%DISTNAME%%/doc/Manual/mtoplevel.html -lib/%%DISTNAME%%/doc/Manual/mtunbound.html lib/%%DISTNAME%%/doc/Manual/navigator.html lib/%%DISTNAME%%/doc/Manual/nb_set.html lib/%%DISTNAME%%/doc/Manual/next.gif |