summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam>2002-09-29 07:13:32 +0000
committerjlam <jlam>2002-09-29 07:13:32 +0000
commit9e38df7953398e76bc758059fb729389e6aac12b (patch)
treee0ee0ae3dec8d66d5f6cfd2738612f35b88d3950 /graphics
parent20dbaef88472caebc7e29a35a13c7603dd48b563 (diff)
downloadpkgsrc-9e38df7953398e76bc758059fb729389e6aac12b.tar.gz
Use gcc/buildlink2.mk instead of Makefile.gcc
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ogle/Makefile19
-rw-r--r--graphics/ogle_gui/Makefile5
2 files changed, 11 insertions, 13 deletions
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index e0cf6013dc6..cb3d286194b 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/09/10 16:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/29 07:13:32 jlam Exp $
DISTNAME= ogle-0.8.5
PKGREVISION= 1
@@ -13,24 +13,23 @@ ONLY_FOR_PLATFORM= NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386
ONLY_FOR_PLATFORM+= NetBSD-1.[6-9]*-i386
ONLY_FOR_PLATFORM+= NetBSD-1.6[D-Z]*-powerpc NetBSD-1.[7-9]*-powerpc
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-#CONFIGURE_ARGS+=--enable-obsdaudio
-#CONFIGURE_ARGS+=--disable-sunaudio
-
-GNU_CONFIGURE= yes
+USE_BUILDLINK2= yes
+USE_X11= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-USE_BUILDLINK2= yes
-USE_X11= yes
-.include "../../devel/binutils/buildlink2.mk"
-.include "../../lang/gcc/Makefile.gcc"
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+#CONFIGURE_ARGS+= --enable-obsdaudio
+#CONFIGURE_ARGS+= --disable-sunaudio
.include "../../audio/liba52/buildlink2.mk"
.include "../../audio/mad/buildlink2.mk"
+.include "../../devel/binutils/buildlink2.mk"
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../lang/gcc/buildlink2.mk"
.include "../../misc/libdvdread/buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index ffab24cd894..8d5decc0be2 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/22 10:16:16 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/29 07:21:43 jlam Exp $
DISTNAME= ogle_gui-0.8.5
PKGREVISION= 1
@@ -22,10 +22,9 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LDFLAGS+= ${BUILDLINK_LDFLAGS.ogle}
.include "../../devel/binutils/buildlink2.mk"
-.include "../../lang/gcc/Makefile.gcc"
-
.include "../../devel/libglade/buildlink2.mk"
.include "../../graphics/ogle/buildlink2.mk"
+.include "../../lang/gcc/buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"