From owner-svn-ports-all@FreeBSD.ORG Sun Jan 5 20:03:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33327FA9; Sun, 5 Jan 2014 20:03:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13F621F58; Sun, 5 Jan 2014 20:03:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s05K3LxB052508; Sun, 5 Jan 2014 20:03:21 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05K3LRm052505; Sun, 5 Jan 2014 20:03:21 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201401052003.s05K3LRm052505@svn.freebsd.org> From: Johan van Selst Date: Sun, 5 Jan 2014 20:03:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338821 - head/lang/swi-pl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2014 20:03:22 -0000 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 - -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -.else -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -.endif - .include .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