pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Remove redundant SUBST_* from pac...
details: https://anonhg.NetBSD.org/pkgsrc/rev/128087bcfeaf
branches: trunk
changeset: 531394:128087bcfeaf
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Sun Jul 29 14:06:44 2007 +0000
description:
Remove redundant SUBST_* from package Makefile
OK'ed joerg@
diffstat:
pkgtools/pkg_install/Makefile | 19 +++++--------------
pkgtools/pkg_install/files/audit-packages/Makefile.in | 13 ++++---------
2 files changed, 9 insertions(+), 23 deletions(-)
diffs (78 lines):
diff -r 08368eb216cf -r 128087bcfeaf pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile Sun Jul 29 13:17:57 2007 +0000
+++ b/pkgtools/pkg_install/Makefile Sun Jul 29 14:06:44 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2007/07/25 15:01:45 joerg Exp $
+# $NetBSD: Makefile,v 1.135 2007/07/29 14:06:44 adrianp Exp $
# Notes to package maintainers:
#
@@ -77,23 +77,14 @@
VERSION!= ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
${FILESDIR}/lib/version.h
-# Make sure download-vulnerability-list.sh picks up the right tools
-# in the right directories.
+# Make sure the audit-packages files pick up the right tools in the right
+# places.
#
SUBST_CLASSES= paths
SUBST_STAGE.paths= pre-configure
SUBST_MESSAGE.paths= Fixing paths in scripts.
-SUBST_FILES.paths= audit-packages/download-vulnerability-list.sh.in
-SUBST_FILES.paths+= audit-packages/audit-packages.1.in
-SUBST_FILES.paths+= audit-packages/audit-packages.cat1.in
-SUBST_FILES.paths+= audit-packages/audit-packages.conf.5.in
-SUBST_FILES.paths+= audit-packages/audit-packages.conf.cat5.in
-SUBST_FILES.paths+= audit-packages/audit-packages.conf.in
-SUBST_FILES.paths+= audit-packages/download-vulnerability-list.1.in
-SUBST_FILES.paths+= audit-packages/download-vulnerability-list.cat1.in
-SUBST_SED.paths= -e 's,@gzcat@,${GZCAT},g'
-SUBST_SED.paths+= -e 's,@sysconfdir@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,@prefix@/bin/gpg,${PREFIX}/bin/gpg,g'
+SUBST_FILES.paths= audit-packages/Makefile.in
+SUBST_SED.paths= -e 's,_gzcat_,${GZCAT},g'
do-extract:
@${CP} -R ${FILESDIR} ${WRKSRC}
diff -r 08368eb216cf -r 128087bcfeaf pkgtools/pkg_install/files/audit-packages/Makefile.in
--- a/pkgtools/pkg_install/files/audit-packages/Makefile.in Sun Jul 29 13:17:57 2007 +0000
+++ b/pkgtools/pkg_install/files/audit-packages/Makefile.in Sun Jul 29 14:06:44 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.2 2007/07/16 09:57:57 joerg Exp $
+# $NetBSD: Makefile.in,v 1.3 2007/07/29 14:06:44 adrianp Exp $
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -15,12 +15,7 @@
cat1dir = $(mandir)/cat1
sharedir = $(prefix)/share/examples/pkg_install
-do_subst = sed -e 's,_pkgdbdir_,$(pkgdbdir),g' \
- -e 's,_sysconfdir_,$(sysconfdir),g' \
- -e 's,_prefix_,$(prefix),g' \
- -e 's,_pprefix_,$(pprefix),g' \
- -e 's,_ftp_,@ftp@,g' \
- -e 's,_gzcat_,@gzcat@,g'
+do_subst = sed -e 's,@gzcat@,_gzcat_,g'
CC = @CC@
CCLD= $(CC)
@@ -30,7 +25,7 @@
DEFS= @DEFS@
CFLAGS= @CFLAGS@ -Wall
LDFLAGS= @LDFLAGS@ -L../lib
-SUBST_FILES= audit-packages.1 download-vulnerability-list.1 audit-packages.conf audit-packages.conf.5 audit-packages.conf.cat5
+SUBST_FILES= audit-packages.conf.5 audit-packages.conf.cat5 audit-packages.conf download-vulnerability-list.sh
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -46,7 +41,7 @@
.c.o:
$(COMPILE) -c $< -o $@
-all: audit-packages
+all: subst audit-packages
audit-packages: $(audit-packages_OBJS)
$(LINK) $(audit-packages_OBJS) $(LIBS)
Home |
Main Index |
Thread Index |
Old Index