Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jan 2014 20:03:21 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338821 - head/lang/swi-pl
Message-ID:  <201401052003.s05K3LRm052505@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Sun Jan  5 20:03:21 2014
New Revision: 338821
URL: http://svnweb.freebsd.org/changeset/ports/338821

Log:
  - Update SWI Prolog to 6.6.1 (bugfix release)
  - Simplify options check

Modified:
  head/lang/swi-pl/Makefile
  head/lang/swi-pl/distinfo
  head/lang/swi-pl/pkg-plist

Modified: head/lang/swi-pl/Makefile
==============================================================================
--- head/lang/swi-pl/Makefile	Sun Jan  5 19:52:20 2014	(r338820)
+++ head/lang/swi-pl/Makefile	Sun Jan  5 20:03:21 2014	(r338821)
@@ -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")

Modified: head/lang/swi-pl/distinfo
==============================================================================
--- head/lang/swi-pl/distinfo	Sun Jan  5 19:52:20 2014	(r338820)
+++ head/lang/swi-pl/distinfo	Sun Jan  5 20:03:21 2014	(r338821)
@@ -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

Modified: head/lang/swi-pl/pkg-plist
==============================================================================
--- head/lang/swi-pl/pkg-plist	Sun Jan  5 19:52:20 2014	(r338820)
+++ head/lang/swi-pl/pkg-plist	Sun Jan  5 20:03:21 2014	(r338821)
@@ -163,7 +163,6 @@ lib/%%DISTNAME%%/doc/Manual/moduleop.htm
 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



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