summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2007-12-31 06:39:41 +0000
committerobache <obache@pkgsrc.org>2007-12-31 06:39:41 +0000
commit7320e5225646bb8edb3a9c8df079f493a83e3395 (patch)
treed4ff57ad1114dee93f157a9cf3114458c929bed3
parent93403ed23ff55f3e33cfea18ac5ac9e5180be406 (diff)
downloadpkgsrc-7320e5225646bb8edb3a9c8df079f493a83e3395.tar.gz
* This package use BSD_MAKEFILE, remove redundant variables.
XXX: BINMODE and MANMODE also should be added to BSD_MAKE_ENV? * Honor PKGMANDIR. * Need some pre-created directories before installation. * Then DESTDIR ready.
-rw-r--r--textproc/qsubst/Makefile12
-rw-r--r--textproc/qsubst/distinfo4
-rw-r--r--textproc/qsubst/patches/patch-aa10
3 files changed, 15 insertions, 11 deletions
diff --git a/textproc/qsubst/Makefile b/textproc/qsubst/Makefile
index c60209fc8d0..8283a027216 100644
--- a/textproc/qsubst/Makefile
+++ b/textproc/qsubst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/10 19:59:43 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/31 06:39:41 obache Exp $
#
DISTNAME= qsubst-20010422
@@ -8,9 +8,15 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Query-replace strings in files
+USE_BSD_MAKEFILE= yes
+
WRKSRC= ${WRKDIR}/qsubst
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
-MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
+INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+
+MAKE_ENV+= BINMODE=${BINMODE}
+MAKE_ENV+= MANMODE=${MANMODE}
+
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/qsubst/distinfo b/textproc/qsubst/distinfo
index 8932afc815a..6b72d52afb5 100644
--- a/textproc/qsubst/distinfo
+++ b/textproc/qsubst/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/05/16 18:43:44 christos Exp $
+$NetBSD: distinfo,v 1.7 2007/12/31 06:39:42 obache Exp $
SHA1 (qsubst-20010422.tar.gz) = 9602b274ff10266b94a96adc90ded003f8cdeda8
RMD160 (qsubst-20010422.tar.gz) = 443d5d5d2a014a286f436685c9e188255b6acd0a
Size (qsubst-20010422.tar.gz) = 5965 bytes
-SHA1 (patch-aa) = d7ff425da3ddfaca2385e5d849457e74c89acfff
+SHA1 (patch-aa) = 023f59c2ce9130500b7ed7d1ab3c7c75db8cf37b
SHA1 (patch-ab) = 1b740a8e82e0c6f20948b42cb03371fd028145fd
diff --git a/textproc/qsubst/patches/patch-aa b/textproc/qsubst/patches/patch-aa
index 6bb40afab49..dab19732c59 100644
--- a/textproc/qsubst/patches/patch-aa
+++ b/textproc/qsubst/patches/patch-aa
@@ -1,12 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2001/04/22 06:00:42 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2007/12/31 06:39:42 obache Exp $
---- Makefile.orig Sun Sep 5 03:07:22 1999
-+++ Makefile Sun Apr 22 15:59:15 2001
-@@ -2,4 +2,7 @@
+--- Makefile.orig 1999-09-04 17:07:22.000000000 +0000
++++ Makefile
+@@ -2,4 +2,5 @@
PROG= qsubst
+WARNS?= 1
-+BINDIR= ${PREFIX}/bin
-+MANDIR= ${PREFIX}/man
DPADD+= $(LIBTERMCAP}
LDADD+= -ltermcap