Subject: pkg/15107: Binary stripping fixes for many packages
To: None <gnats-bugs@gnats.netbsd.org>
From: Eric Gillespie, Jr. <epg@pretzelnet.org>
List: netbsd-bugs
Date: 01/01/2002 13:39:10
>Number:         15107
>Category:       pkg
>Synopsis:       Binary stripping fixes for many packages
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 01 10:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Eric Gillespie Jr.
>Release:        NetBSD 1.5.1
>Organization:
>Environment:
System: NetBSD trantor.pretzelnet.org 1.5.2 NetBSD 1.5.2 ($Id: TRANTOR,v 1.7 2001/11/24 20:48:33 epg Exp $) #3: Sat Nov 24 15:58:07 EST 2001 epg@trantor.pretzelnet.org:/u/src/sys/arch/i386/compile/TRANTOR i386


>Description:
Many packages simply strip binaries without regard to the user's
wishes.  That is, they ignore the configurable STRIPFLAG and STRIP in
/etc/mk.conf.  I have the following in mk.conf because i always want
debugging symbols in all binaries:

CFLAGS+=-g
STRIPFLAG=#none
STRIP=/usr/bin/true

>How-To-Repeat:
Put the above bits into /etc/mk.conf and make mtr-gtk.  Note the
stripped binary.

>Fix:
Apply the following patch.  I had to include bsd.sys.mk in all
Makefiles i changed to use STRIP because apparently that is not
include in bsd.pkg.mk.  IMHO, it should be, so that part of the patch
would go away.

Note that for graphics/giram, mail/courier-imap, mail/maildrop, and
wm/windowmaker, i only had to change the install target.  Since
INSTALL_PROGRAM includes -s by default, using install-strip is
pointless.  This change results in Makefiles with this line by default

INSTALL_PROGRAM = install -c -s -o root -g wheel -m 555 $(AM_INSTALL_PROGRAM_FLAGS)

and this line for me

INSTALL_PROGRAM = install -c  -o root -g wheel -m 555 $(AM_INSTALL_PROGRAM_FLAGS)

which is expected behavior.

Also, i think a note about this in Packages.txt would be valuable.

Index: audio/tracker/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/tracker/Makefile,v
retrieving revision 1.17
diff -a -u -r1.17 Makefile
--- Makefile	2001/04/09 11:45:34	1.17
+++ Makefile	2002/01/01 18:22:23
@@ -18,8 +18,8 @@
 
 WRKSRC=			${WRKDIR}/tracker
 MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
-		INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
-		INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
+		INST_BIN_OPT="${COPY} ${STRIPFLAG} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
+		INST_MAN_OPT="${COPY} -m 644 -o ${BINOWN} -g ${BINGRP}" \
 		COMPRESSION_FILE=${PREFIX}/etc/compression_methods
 
 INFO_FILES=		tracker.info
Index: audio/xmcd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmcd/Makefile,v
retrieving revision 1.28
diff -a -u -r1.28 Makefile
--- Makefile	2001/09/08 19:55:40	1.28
+++ Makefile	2002/01/01 18:22:23
@@ -22,10 +22,12 @@
 		${MV} -f $$f.new $$f; \
 	done
 
+.include <bsd.sys.mk>
+
 post-install:
 .for FILE in cda xmcd gobrowser
 	@${TEST} -n "${STRIPFLAG}" && \
-	strip ${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/${FILE}
+	${STRIP} ${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/${FILE}
 .endfor
 	${MV} ${PREFIX}/man/cat1/cda.1 ${PREFIX}/man/man1/cda.1
 	${MV} ${PREFIX}/man/cat1/xmcd.1 ${PREFIX}/man/man1/xmcd.1
Index: cad/spice/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/cad/spice/Makefile,v
retrieving revision 1.19
diff -a -u -r1.19 Makefile
--- Makefile	2001/09/27 23:17:47	1.19
+++ Makefile	2002/01/01 18:22:23
@@ -38,12 +38,14 @@
 do-build:
 	cd ${WRKSRC} ; util/build NetBSD default
 
+.include <bsd.sys.mk>
+
 do-install:
 	cd ${WRKSRC} ; util/build NetBSD install
 	${CHMOD} a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
 	  ${PREFIX}/bin/sconvert ${PREFIX}/bin/help	\
 	  ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
-	strip ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg	\
+	${STRIP} ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg	\
 	  ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
 	  ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
 	${CHMOD} -R a+rX ${PREFIX}/share/spice3
Index: games/angband-tty/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/angband-tty/Makefile,v
retrieving revision 1.8
diff -a -u -r1.8 Makefile
--- Makefile	2001/09/27 23:18:04	1.8
+++ Makefile	2002/01/01 18:22:23
@@ -29,6 +29,6 @@
 	${CHOWN} -R bin:games ${PREFIX}/share/angband
 	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
 	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
-	${INSTALL} -c -s -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
+	${INSTALL} ${COPY} ${STRIPFLAG} -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
Index: games/angband-x11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/angband-x11/Makefile,v
retrieving revision 1.9
diff -a -u -r1.9 Makefile
--- Makefile	2001/12/15 20:25:36	1.9
+++ Makefile	2002/01/01 18:22:23
@@ -33,6 +33,6 @@
 	${CHOWN} -R bin:games ${PREFIX}/share/angband
 	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
 	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
-	${INSTALL} -c -s -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
+	${INSTALL} ${COPY} ${STRIPFLAG} -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
Index: games/battalion/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/battalion/Makefile,v
retrieving revision 1.19
diff -a -u -r1.19 Makefile
--- Makefile	2001/12/05 15:00:44	1.19
+++ Makefile	2002/01/01 18:22:23
@@ -19,7 +19,7 @@
 USE_MESA=		yes
 
 do-install:
-	${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
+	${INSTALL} ${COPY} ${STRIPFLAG} -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
 	cd ${WRKDIR} && \
 	    ${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz | ${GTAR} xmf -
 	${INSTALL_DATA_DIR} ${PREFIX}/share/battalion/HELP
Index: games/iso-pernangband/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/iso-pernangband/Makefile,v
retrieving revision 1.3
diff -a -u -r1.3 Makefile
--- Makefile	2001/10/20 00:12:32	1.3
+++ Makefile	2002/01/01 18:22:23
@@ -42,7 +42,7 @@
 	${CHOWN} -R bin:games ${PREFIX}/share/iso-pernangband
 	${CHMOD} -R 0664 ${PREFIX}/share/iso-pernangband
 	${FIND} ${PREFIX}/share/iso-pernangband -type d | ${XARGS} ${CHMOD} 0775
-	${INSTALL} -c -s -o bin -g games -m 2755 \
+	${INSTALL} ${COPY} ${STRIPFLAG} -o bin -g games -m 2755 \
 		${WRKSRC}/testing \
 		${PREFIX}/bin/iso-pernangband
 
Index: graphics/giram/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/giram/Makefile,v
retrieving revision 1.16
diff -a -u -r1.16 Makefile
--- Makefile	2001/09/27 23:18:11	1.16
+++ Makefile	2002/01/01 18:22:23
@@ -23,8 +23,6 @@
 CONFIGURE_ENV=	GTK_CONFIG="${GTKDIR}/bin/gtk-config" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
-ALL_TARGET=	install-strip
-
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Giram
 	${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/
Index: lang/perl5/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/perl5/Makefile,v
retrieving revision 1.53
diff -a -u -r1.53 Makefile
--- Makefile	2001/12/14 19:26:11	1.53
+++ Makefile	2002/01/01 18:22:24
@@ -144,14 +144,16 @@
 	cd ${.CURDIR} && ${MAKE} build ${STATIC_MAKEFLAGS}
 .endif
 
+.include <bsd.sys.mk>
+
 post-install:
 .if defined(STATIC_PERL) && (${STATIC_PERL} == "YES")
 	${RM} -f ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL5_DIST_VERS}
 	${INSTALL_PROGRAM} ${STATIC_WRKDIR}/${DISTNAME}/perl ${PREFIX}/bin/perl
 	${LN} -f ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL5_DIST_VERS}
 .endif
-	strip ${PREFIX}/bin/a2p
-	strip ${PREFIX}/bin/perl
+	${STRIP} ${PREFIX}/bin/a2p
+	${STRIP} ${PREFIX}/bin/perl
 	${RMDIR} -p ${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
 	${RM} -f ${WRKDIR}/bsd.perl.mk
 	eval `${PERL5} -V:installsitelib 2>/dev/null` && \
Index: lang/ruby-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby-base/Makefile,v
retrieving revision 1.3
diff -a -u -r1.3 Makefile
--- Makefile	2001/12/30 16:21:51	1.3
+++ Makefile	2002/01/01 18:22:24
@@ -65,8 +65,10 @@
 post-build:
 	${MV} -f ${WRKSRC}/sample/irb.rb ${WRKDIR}/irb.rb
 
+.include <bsd.sys.mk>
+
 post-install:
-	strip ${RUBY}
+	${STRIP} ${RUBY}
 .if empty(RUBY_SUFFIX)
 	${MV} ${RUBY} ${RUBY}${_RUBY_SUFFIX}
 	${LN} -fs ruby${_RUBY_SUFFIX} ${RUBY}
Index: lang/ruby14-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby14-base/Makefile,v
retrieving revision 1.2
diff -a -u -r1.2 Makefile
--- Makefile	2001/06/30 14:11:27	1.2
+++ Makefile	2002/01/01 18:22:24
@@ -49,8 +49,10 @@
 	${SED} -e 's|#!/usr/local/bin/ruby|#!${RUBY}|' \
 		${WRKSRC}/sample/irb.rb > ${WRKDIR}/irb.rb
 
+.include <bsd.sys.mk>
+
 post-install:
-	strip ${RUBY}
+	${STRIP} ${RUBY}
 .if empty(RUBY_SUFFIX)
 	${MV} ${RUBY} ${RUBY}${_RUBY_SUFFIX}
 	${LN} -fs ruby${_RUBY_SUFFIX} ${RUBY}
Index: mail/courier-imap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/Makefile,v
retrieving revision 1.6
diff -a -u -r1.6 Makefile
--- Makefile	2001/08/16 06:56:50	1.6
+++ Makefile	2002/01/01 18:22:24
@@ -25,8 +25,6 @@
 CONFIGURE_ARGS+=	--disable-root-check
 CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
 
-INSTALL_TARGET=		install-strip
-
 .include "../../mk/bsd.prefs.mk"
 
 #.if defined(USE_PAM)
Index: mail/exim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/Makefile,v
retrieving revision 1.27
diff -a -u -r1.27 Makefile
--- Makefile	2001/12/19 17:11:02	1.27
+++ Makefile	2002/01/01 18:22:24
@@ -21,16 +21,18 @@
 	    < ${WRKSRC}/Local/Makefile.netbsd \
 	    > ${WRKSRC}/Local/Makefile
 
+.include <bsd.sys.mk>
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/exim
 	${INSTALL_DATA_DIR} /var/log/exim
 	${CHMOD} 750 /var/log/exim
-	strip ${WRKSRC}/build*/exim
-	strip ${WRKSRC}/build*/exim_dbmbuild
-	strip ${WRKSRC}/build*/exim_tidydb
-	strip ${WRKSRC}/build*/exim_fixdb
-	strip ${WRKSRC}/build*/exim_dumpdb
-	strip ${WRKSRC}/build*/exim_lock
+	${STRIP} ${WRKSRC}/build*/exim
+	${STRIP} ${WRKSRC}/build*/exim_dbmbuild
+	${STRIP} ${WRKSRC}/build*/exim_tidydb
+	${STRIP} ${WRKSRC}/build*/exim_fixdb
+	${STRIP} ${WRKSRC}/build*/exim_dumpdb
+	${STRIP} ${WRKSRC}/build*/exim_lock
 
 post-install:
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
Index: mail/maildrop/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/maildrop/Makefile,v
retrieving revision 1.5
diff -a -u -r1.5 Makefile
--- Makefile	2001/08/16 07:39:21	1.5
+++ Makefile	2002/01/01 18:22:24
@@ -19,8 +19,6 @@
 CONFIGURE_ARGS+=	--with-db=db
 CONFIGURE_ARGS+=	--with-etcdir=/etc
 
-INSTALL_TARGET=		install-strip
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
Index: mail/xmailwatcher/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/xmailwatcher/Makefile,v
retrieving revision 1.2
diff -a -u -r1.2 Makefile
--- Makefile	2001/07/05 20:47:04	1.2
+++ Makefile	2002/01/01 18:22:24
@@ -11,9 +11,11 @@
 
 USE_IMAKE=		yes
 
+.include <bsd.sys.mk>
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/xmailwatcher.0 ${PREFIX}/man/man1/xmailwatcher.1
 	${INSTALL_PROGRAM} ${WRKSRC}/xmailwatcher ${PREFIX}/bin
-	strip ${PREFIX}/bin/xmailwatcher
+	${STRIP} ${PREFIX}/bin/xmailwatcher
 
 .include "../../mk/bsd.pkg.mk"
Index: net/bounce/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/bounce/Makefile,v
retrieving revision 1.2
diff -a -u -r1.2 Makefile
--- Makefile	2001/02/17 18:18:38	1.2
+++ Makefile	2002/01/01 18:22:24
@@ -15,7 +15,9 @@
 
 ALL_TARGET=		bounce
 
+.include <bsd.sys.mk>
+
 post-install:
-	strip ${PREFIX}/bin/bounce
+	${STRIP} ${PREFIX}/bin/bounce
 
 .include "../../mk/bsd.pkg.mk"
Index: net/mtr-gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr-gtk/Makefile,v
retrieving revision 1.4
diff -a -u -r1.4 Makefile
--- Makefile	2001/12/05 15:00:48	1.4
+++ Makefile	2002/01/01 18:22:24
@@ -18,7 +18,7 @@
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr-gtk
-	${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin/mtr-gtk
+	${INSTALL} ${COPY} ${STRIPFLAG} -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin/mtr-gtk
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk
 
Index: net/mtr/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/mtr/Makefile,v
retrieving revision 1.23
diff -a -u -r1.23 Makefile
--- Makefile	2001/12/05 15:00:48	1.23
+++ Makefile	2002/01/01 18:22:24
@@ -17,7 +17,7 @@
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr
-	${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin
+	${INSTALL} ${COPY} ${STRIPFLAG} -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
 
Index: net/netperf/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/netperf/Makefile,v
retrieving revision 1.8
diff -a -u -r1.8 Makefile
--- Makefile	2001/10/26 10:03:50	1.8
+++ Makefile	2002/01/01 18:22:24
@@ -26,9 +26,11 @@
 CFLAGS+=	-DDO_IPV6
 .endif
 
+.include <bsd.sys.mk>
+
 post-install:
-	strip ${PREFIX}/netperf/netperf
-	strip ${PREFIX}/netperf/netserver
+	${STRIP} ${PREFIX}/netperf/netperf
+	${STRIP} ${PREFIX}/netperf/netserver
 	${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1
 	${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netperf
Index: net/rdist6/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/rdist6/Makefile,v
retrieving revision 1.9
diff -a -u -r1.9 Makefile
--- Makefile	2001/09/27 23:18:31	1.9
+++ Makefile	2002/01/01 18:22:24
@@ -15,8 +15,10 @@
 
 CONFLICTS=	rdist6-[0-9]*
 
+.include <bsd.sys.mk>
+
 post-install:
-	@strip ${PREFIX}/bin/${RDIST6_NAME}
-	@strip ${PREFIX}/bin/rdistd
+	${STRIP} ${PREFIX}/bin/${RDIST6_NAME}
+	${STRIP} ${PREFIX}/bin/rdistd
 
 .include "../../mk/bsd.pkg.mk"
Index: net/rsync/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/rsync/Makefile,v
retrieving revision 1.35
diff -a -u -r1.35 Makefile
--- Makefile	2001/02/25 04:18:07	1.35
+++ Makefile	2002/01/01 18:22:24
@@ -30,8 +30,10 @@
 CONFIGURE_ARGS=	--disable-ipv6
 .endif
 
+.include <bsd.sys.mk>
+
 post-install:
-	@strip ${PREFIX}/bin/rsync
+	${STRIP} ${PREFIX}/bin/rsync
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rsync
 	${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync
 
Index: print/psutils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/psutils/Makefile,v
retrieving revision 1.20
diff -a -u -r1.20 Makefile
--- Makefile	2001/09/27 23:18:36	1.20
+++ Makefile	2002/01/01 18:22:24
@@ -44,9 +44,11 @@
 	${MV} ${WRKSRC}/psutil.c ${WRKSRC}/psutil.c.in
 	${SED} -e 's|@prefix@|${PREFIX}|g' ${WRKSRC}/psutil.c.in > ${WRKSRC}/psutil.c
 
+.include <bsd.sys.mk>
+
 post-install:
 	for f in epsffit psbook psnup psresize psselect pstops; do	\
-		strip ${PREFIX}/bin/$$f;				\
+		${STRIP} ${PREFIX}/bin/$$f;				\
 	done
 	low=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`;		\
 	if [ ! -f ${PREFIX}/etc/psutils.cfg ]; then			\
Index: shells/scsh/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/shells/scsh/Makefile,v
retrieving revision 1.16
diff -a -u -r1.16 Makefile
--- Makefile	2001/10/02 11:07:15	1.16
+++ Makefile	2002/01/01 18:22:24
@@ -22,8 +22,10 @@
 post-configure:
 	cd ${WRKSRC}; ${SED} -e '/LIBGEN/d' sysdep.h >xx ; ${MV} xx sysdep.h
 
+.include <bsd.sys.mk>
+
 post-install:
-	@strip ${PREFIX}/bin/scsh
+	${STRIP} ${PREFIX}/bin/scsh
 	(cd ${WRKSRC} ; \
 	 ${INSTALL_DATA} README RELEASE NEWS COPYING ${PREFIX}/lib/scsh/doc)
 	${RM} -f ${PREFIX}/share/doc/scsh
Index: textproc/jade/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/jade/Makefile,v
retrieving revision 1.18
diff -a -u -r1.18 Makefile
--- Makefile	2001/11/29 01:12:49	1.18
+++ Makefile	2002/01/01 18:22:24
@@ -36,10 +36,12 @@
 	@${CHMOD} -R +w ${WRKSRC}
 	@${FIND} ${WRKSRC} -name '*.orig' -size 0c -type f | ${XARGS} ${RM}
 
+.include <bsd.sys.mk>
+
 post-install:
 	@for prog in jade nsgmls sgmlnorm spam spent sx; do		\
 		${ECHO_MSG} "strip ${PREFIX}/bin/$${prog}";		\
-		strip ${PREFIX}/bin/$${prog};				\
+		${STRIP} ${PREFIX}/bin/$${prog};			\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/include/sp
 	${INSTALL_DATA} ${WRKSRC}/include/*.cxx ${WRKSRC}/include/*.h \
Index: textproc/rman/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/rman/Makefile,v
retrieving revision 1.18
diff -a -u -r1.18 Makefile
--- Makefile	2001/05/03 13:53:10	1.18
+++ Makefile	2002/01/01 18:22:24
@@ -20,7 +20,9 @@
 IGNORE=		"Rosetta Man is included in your X distribution."
 .endif
 
+.include <bsd.sys.mk>
+
 post-install:
-	strip ${PREFIX}/bin/rman
+	${STRIP} ${PREFIX}/bin/rman
 
 .include "../../mk/bsd.pkg.mk"
Index: wm/windowmaker/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/Makefile,v
retrieving revision 1.24
diff -a -u -r1.24 Makefile
--- Makefile	2001/12/25 15:10:49	1.24
+++ Makefile	2002/01/01 18:22:24
@@ -26,8 +26,6 @@
 			--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ENV+=		LINGUAS=yes
 
-INSTALL_TARGET=		install-strip
-
 .include "../../mk/bsd.prefs.mk"
 
 # "egcs" has an optimizer problem on "arm32".
Index: x11/dxpc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/dxpc/Makefile,v
retrieving revision 1.14
diff -a -u -r1.14 Makefile
--- Makefile	2001/10/22 01:05:40	1.14
+++ Makefile	2002/01/01 18:22:24
@@ -20,8 +20,10 @@
 CONFIGURE_ENV+=	CXX=${LOCALBASE}/egcs/bin/g++
 .endif
 
+.include <bsd.sys.mk>
+
 post-install:
-	@strip ${PREFIX}/bin/dxpc
+	${STRIP} ${PREFIX}/bin/dxpc
 
 .include "../../archivers/liblzo/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
>Release-Note:
>Audit-Trail:
>Unformatted: