Subject: pkg/19199: new dillo update needs CFLAGS fixed
To: None <gnats-bugs@gnats.netbsd.org>
From: None <reed@reedmedia.net>
List: netbsd-bugs
Date: 11/28/2002 22:06:23
>Number:         19199
>Category:       pkg
>Synopsis:       CFLAGS not used in new www/dillo (patches included)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 28 22:07:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6
>Organization:
http://bsd.reedmedia.net/
>Environment:
	
	
System: NetBSD rainier.reedmedia.net 1.6 NetBSD 1.6 (JCR-20020927) #3: Sat Sep 28 13:40:20 PDT 2002 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/JCR-20020927 i386
Architecture: i386
Machine: i386
>Description:
www/dillo's Makefile sets up the CFLAGS, but is not used by src/Makefile
>How-To-Repeat:
make will report:

prefs.c:246: `PKG_SYSCONFDIR' undeclared (first use in this function)

because the -D macro isn't in the CFLAGS
>Fix:
Below is a patch and the additional patch-ad. (be sure to rerun
makepatchsum)

--- Makefile.orig	2002-11-28 21:49:03.000000000 -0800
+++ Makefile	2002-11-28 21:50:16.000000000 -0800
@@ -18,7 +18,7 @@
 EGDIR=		${PREFIX}/share/examples/dillo
 CONF_FILES=	${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
 
-CFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+MAKE_ENV+=	X_CFLAGS="${CFLAGS} -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\""
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo

This is for patches/patch-ad:

--- src/Makefile.in.orig	2002-11-28 21:47:37.000000000 -0800
+++ src/Makefile.in	2002-11-28 21:48:12.000000000 -0800
@@ -99,7 +99,7 @@
 prefs.o colors.o bitvec.o klist.o url.o cookies.o
 dillo_DEPENDENCIES =  IO/libDio.a
 dillo_LDFLAGS = 
-CFLAGS = @CFLAGS@
+CFLAGS = $(X_CFLAGS) @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
>Release-Note:
>Audit-Trail:
>Unformatted: