From b0eebb83b895381349f1378a91d0fcadcf916bdd Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 16 Jan 2006 07:17:43 +0000 Subject: Add USE_OPENSSL and modify CONFIGURE_ENV and LDFLAGS accordingly. This fixes the build if non-base OpenSSL is used. Obtained from: FreeBSD ports tree git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5385 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 5 +++-- devel/gnomevfs2/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index d2c4f7db4..31844d6a8 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett # # $FreeBSD: ports/devel/gnomevfs2/Makefile,v 1.102 2005/11/05 04:53:17 marcus Exp $ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.121 2005/12/14 05:24:12 marcus Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.122 2005/12/15 03:27:00 marcus Exp $ # PORTNAME= gnomevfs2 @@ -26,13 +26,14 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo ltverhack USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 +USE_OPENSSL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --disable-howl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index d2c4f7db4..31844d6a8 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett # # $FreeBSD: ports/devel/gnomevfs2/Makefile,v 1.102 2005/11/05 04:53:17 marcus Exp $ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.121 2005/12/14 05:24:12 marcus Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.122 2005/12/15 03:27:00 marcus Exp $ # PORTNAME= gnomevfs2 @@ -26,13 +26,14 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo ltverhack USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 +USE_OPENSSL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --disable-howl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -- cgit v1.2.3