>Number:         15500
>Category:       pkg
>Synopsis:       cosmetic changes in graphics/aview and graphics/aview-x11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Feb 05 12:35:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Lubomir Sedlacik
>Release:        NetBSD 1.5ZA
>Organization:
>Environment:
>Description:

two small patches for graphics/aview and graphics/aview-x11 repectively.
include bsd.pkg.install.mk and remove FILES_SUBST_SED to be more compatible
with pkgsrc.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/aview-x11/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	2002/01/30 11:41:55	1.1.1.1
+++ Makefile	2002/02/05 20:28:23
@@ -20,11 +20,10 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
-FILES_SUBST= BIN_PROGRAMS="aview aaflip"
+FILES_SUBST+= BIN_PROGRAMS="aview aaflip"
 .else
-FILES_SUBST= BIN_PROGRAMS="aview"
+FILES_SUBST+= BIN_PROGRAMS="aview"
 .endif
-FILES_SUBST_SED=  ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
 
 pre-configure:
 	@${SED} ${FILES_SUBST_SED} ${WRKSRC}/Makefile.in > ${WRKDIR}/Makefile.in
@@ -47,4 +46,5 @@
 .include "../../graphics/aalib-x11/buildlink.mk"
 .include "../../graphics/netpbm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"



Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/aview/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	2002/01/30 12:05:27	1.2
+++ Makefile	2002/02/05 20:28:44
@@ -23,11 +23,10 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
-FILES_SUBST= BIN_PROGRAMS="aview aaflip"
+FILES_SUBST+= BIN_PROGRAMS="aview aaflip"
 .else
-FILES_SUBST= BIN_PROGRAMS="aview"
+FILES_SUBST+= BIN_PROGRAMS="aview"
 .endif
-FILES_SUBST_SED=  ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
 
 pre-configure:
 	@${SED} ${FILES_SUBST_SED} ${WRKSRC}/Makefile.in > ${WRKDIR}/Makefile.in
@@ -49,4 +48,5 @@
 
 .include "../../graphics/aalib/buildlink.mk"
 .include "../../graphics/netpbm/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
>Release-Note:
>Audit-Trail:
>Unformatted: