summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 06:23:01 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 06:23:01 +0000
commitd0cdca8bc326260560504ebb5d4b206942ca5125 (patch)
tree6587afa98b84aaf9066d2a7b78f8da1485a724c6 /devel
parentUpdate to 0.5.11 since 0.5.10 is no longer fetchable. (diff)
Implement USE_GLIB.
Notes
Notes: svn path=/head/; revision=33423
Diffstat (limited to 'devel')
-rw-r--r--devel/ORBit/Makefile12
-rw-r--r--devel/ORBit2/Makefile12
-rw-r--r--devel/libole2/Makefile6
-rw-r--r--devel/oaf/Makefile7
4 files changed, 11 insertions, 26 deletions
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 <bsd.port.mk>
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: