aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorJohan van Selst <johans@FreeBSD.org>2014-01-05 20:03:21 +0000
committerJohan van Selst <johans@FreeBSD.org>2014-01-05 20:03:21 +0000
commit7217bc3ca8ea1893a537ca85063ce1cd3b4e576d (patch)
tree00aa0613243eef883c1f5546070b1c9400d2683a /lang
parent39af009e9267534fb615f0db66620f9365da05dd (diff)
downloadports-7217bc3ca8ea1893a537ca85063ce1cd3b4e576d.tar.gz
ports-7217bc3ca8ea1893a537ca85063ce1cd3b4e576d.zip
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/swi-pl/Makefile15
-rw-r--r--lang/swi-pl/distinfo4
-rw-r--r--lang/swi-pl/pkg-plist1
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