summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/gindent/Makefile9
-rw-r--r--devel/glib2/Makefile6
-rw-r--r--devel/glib2/patches/patch-af15
3 files changed, 7 insertions, 23 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 5df44a8498d..ec7a740ffc3 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/09/01 13:50:07 tron Exp $
+# $NetBSD: Makefile,v 1.27 2002/11/30 14:29:23 grant Exp $
#
DISTNAME= indent-2.2.8a
@@ -11,14 +11,13 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/indent/indent.html
COMMENT= GNU version of pretty-printer for C source code
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
+USE_BUILDLINK2= # defined
+GNU_CONFIGURE= # defined
+USE_PKGLOCALEDIR= # defined
CONFIGURE_ARGS= --program-prefix=g
INFO_FILES= indent.info
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 7ee35bda0fa..8c6840cde0f 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/11/15 16:31:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/11/30 14:28:07 grant Exp $
#
DISTNAME= glib-2.0.7
@@ -25,9 +25,9 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gobject-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gthread-2.0.pc.in
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= # defined
+USE_PKGLOCALEDIR= # defined
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
deleted file mode 100644
index ce2a2760b29..00000000000
--- a/devel/glib2/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
-
---- po/Makefile.in.in.orig Thu Jan 31 19:02:12 2002
-+++ po/Makefile.in.in
-@@ -26,8 +26,8 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/${PKGLOCALEDIR}/locale
-+gnulocaledir = $(prefix)/${PKGLOCALEDIR}/locale
- gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
- subdir = po
-