From d0cdca8bc326260560504ebb5d4b206942ca5125 Mon Sep 17 00:00:00 2001 From: Jeremy Lea Date: Thu, 5 Oct 2000 06:23:01 +0000 Subject: Implement USE_GLIB. --- devel/ORBit/Makefile | 12 ++++-------- devel/ORBit2/Makefile | 12 ++++-------- devel/libole2/Makefile | 6 +----- devel/oaf/Makefile | 7 ++----- 4 files changed, 11 insertions(+), 26 deletions(-) (limited to 'devel') diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile index 3c68fbddc69d..4cce72445018 100644 --- a/devel/ORBit/Makefile +++ b/devel/ORBit/Makefile @@ -14,20 +14,16 @@ MASTER_SITE_SUBDIR= stable/sources/ORBit MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ - intl.1:${PORTSDIR}/devel/gettext - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes +USE_GLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFILES= configure libIDL/configure popt/configure -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - CONFIGURE_ARGS= --disable-indent +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" post-install: @${ECHO} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 3c68fbddc69d..4cce72445018 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -14,20 +14,16 @@ MASTER_SITE_SUBDIR= stable/sources/ORBit MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ - intl.1:${PORTSDIR}/devel/gettext - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes +USE_GLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFILES= configure libIDL/configure popt/configure -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - CONFIGURE_ARGS= --disable-indent +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" post-install: @${ECHO} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index 8a8a2edc5062..6bdc9b1dfd52 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR= unstable/sources/libole2 MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_GMAKE= yes +USE_GLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" .include diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index ecd46949ac1f..aa101d9e45df 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -13,15 +13,13 @@ MASTER_SITE_SUBDIR= unstable/sources/oaf MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ - ORBit.2:${PORTSDIR}/devel/ORBit \ +LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \ popt.0:${PORTSDIR}/devel/popt \ xml.5:${PORTSDIR}/textproc/libxml -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -29,7 +27,6 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --enable-static --enable-shared \ --disable-more-warnings CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -lintl" pre-patch: -- cgit v1.2.3