Subject: Re: pkg/30081
To: None <jmmv@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org>
From: Idar Tollefsen <idart@performancedesign.no>
List: pkgsrc-bugs
Date: 09/26/2005 10:37:01
The following reply was made to PR pkg/30081; it has been noted by GNATS.
From: Idar Tollefsen <idart@performancedesign.no>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/30081
Date: Mon, 26 Sep 2005 12:36:01 +0200
This is a multi-part message in MIME format.
--------------090708040504040106010808
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
x11/gtk2/Makefile doesn't include bsd.prefs.mk before adding to CPPFLAGS. When
bsd.prefs.mk is eventually included, it overwrites CPPFLAGS because I have
CPPFLAGS=, not CPPFLAGS+=, in my mk.conf.
Here's a new patch that fixes this. It's the same problem with pkg/30029
(devel/glib2) and the same fix has been submitted for it. I suspect it's the
same with pkg/30030 (databases/shared-mime-info) as well, but haven't tested it.
--------------090708040504040106010808
Content-Type: text/plain;
name="Makefile.diff.gtk2"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="Makefile.diff.gtk2"
--- Makefile.orig Sat Sep 24 21:38:33 2005
+++ Makefile Mon Sep 26 11:00:57 2005
@@ -47,8 +47,10 @@
BUILD_DIRS= ${WRKSRC} ${WRKSRC}/demos/gtk-demo
-CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
+.include "../../mk/bsd.prefs.mk"
+CPPFLAGS+= -DPREFIX=\"${PREFIX}\"
+
PRINT_PLIST_AWK+= /^@dirrm share\/themes\/Default$$/ \
{ print "@unexec $${RMDIR} %D/" $$2 \
" 2>/dev/null || $${TRUE}"; next; }
@@ -59,8 +61,6 @@
SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
-.include "../../mk/compiler.mk"
-
.if ${OPSYS} == "IRIX" && !empty(CC_VERSION:Mgcc*)
USE_TOOLS+= gawk
.endif
--------------090708040504040106010808--