From owner-svn-ports-head@FreeBSD.ORG Mon Sep 23 04:49:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 32BA5DD7; Mon, 23 Sep 2013 04:49:59 +0000 (UTC) (envelope-from johans@FreeBSD.org) 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 071922B98; Mon, 23 Sep 2013 04:49:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8N4nwRg026148; Mon, 23 Sep 2013 04:49:58 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8N4nwnA026147; Mon, 23 Sep 2013 04:49:58 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201309230449.r8N4nwnA026147@svn.freebsd.org> From: Johan van Selst Date: Mon, 23 Sep 2013 04:49:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327905 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 04:49:59 -0000 Author: johans Date: Mon Sep 23 04:49:58 2013 New Revision: 327905 URL: http://svnweb.freebsd.org/changeset/ports/327905 Log: - Work around failing detection of dlopen() this should fix the build on CURRENT - While here, minor style cleanups and dependency correction Reported by: eadler Modified: head/lang/swi-pl/Makefile Modified: head/lang/swi-pl/Makefile ============================================================================== --- head/lang/swi-pl/Makefile Mon Sep 23 04:39:38 2013 (r327904) +++ head/lang/swi-pl/Makefile Mon Sep 23 04:49:58 2013 (r327905) @@ -3,6 +3,7 @@ PORTNAME= swi-pl PORTVERSION= 6.4.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.swi-prolog.org/download/stable/src/ DISTNAME= pl-${PORTVERSION} @@ -10,9 +11,8 @@ DISTNAME= pl-${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Edinburgh-style Prolog compiler -LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \ - readline:${PORTSDIR}/devel/readline \ - jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ + libjpeg.so:${PORTSDIR}/graphics/jpeg OPTIONS_SINGLE= ODBC OPTIONS_SINGLE_ODBC= IODBC UNIXODBC @@ -27,9 +27,8 @@ MAN1= swipl.1 swipl-rc.1 swipl-ld.1 xpc MANCOMPRESSED= no NOPRECIOUSMAKEVARS= yes -USE_GMAKE= yes USE_XORG= xft xpm xt -USES= pkgconfig pathfix +USES= pkgconfig pathfix gmake MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ARCH=${ARCH}-${OPSYS:L} @@ -44,9 +43,9 @@ NO_STAGE= yes .include .if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc .endif .include @@ -66,6 +65,8 @@ post-configure: @${REINPLACE_CMD} -e '/^CMFLAGS=/s/$$/ -fPIC/' \ ${WRKSRC}/packages/Dialect.defs .endif + @{ ${ECHO} "#define HAVE_DLOPEN 1"; ${ECHO} "#define HAVE_DLADDR 1"; }\ + >> ${WRKSRC}/src/config.h post-patch: @${REINPLACE_CMD} -e 's!^mandir=@mandir@!mandir=${MANPREFIX}/man!' \