DESTDIR support

minor clean-ups
++pkgrevsision
This commit is contained in:
Aleksey Cheusov 2008-09-28 14:25:56 +00:00 committed by Thomas Klausner
parent c7f506979f
commit a63b9b3e2d
3 changed files with 55 additions and 21 deletions

View file

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.4 2007/02/20 19:04:26 thomasklausner Exp $
# $NetBSD: Makefile,v 1.5 2008/09/28 14:25:56 cheusov Exp $
# this should use a Makefile.common to share the DISTNAME
GNATS_VERSION= 3.113.1
DISTNAME= gnats-${GNATS_VERSION}
PKGNAME= send-pr-${GNATS_VERSION}
WRKSRC= ${WRKDIR}/gnats-${GNATS_VERSION}/send-pr
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU=gnats/}
@ -15,17 +15,21 @@ COMMENT= GNATS problem reporting tool
CONFLICTS+= gnats-[0-9]*
GNU_CONFIGURE= YES
GNU_CONFIGURE= YES
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= makeinfo
INFO_FILES= # PLIST
USE_TOOLS+= makeinfo
INFO_FILES= # PLIST
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
INSTALL_TARGET= install install-info
# this stops the configuration program from pulling installation
# information in from the standard NetBSD send-pr program
CONFIGURE_ENV+= SEND_PR=/dev/null
AUTO_MKDIRS= yes
post-patch:
${SED} -e "s,install-sid,${PREFIX}/bin/install-sid," \
-e "s,send-pr --request-id,${PREFIX}/bin/send-pr --request-id," \
@ -35,13 +39,8 @@ post-patch:
post-build:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info)
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
${INSTALL_DATA_DIR} ${PREFIX}/share/gnats/dist
post-install:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/gnats/dist/INSTALL.send-pr
${INSTALL_DATA} ${FILESDIR}/netbsd-categories ${PREFIX}/share/gnats/netbsd
${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/gnats/dist/INSTALL.send-pr
${INSTALL_DATA} ${FILESDIR}/netbsd-categories ${DESTDIR}${PREFIX}/share/gnats/netbsd
.include "../../mk/bsd.pkg.mk"

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.2 2005/09/28 06:41:41 rillig Exp $
$NetBSD: distinfo,v 1.3 2008/09/28 14:25:56 cheusov Exp $
SHA1 (gnats-3.113.1.tar.gz) = ad4dbafae3e643c61dbcacb721a1e11a803c67aa
RMD160 (gnats-3.113.1.tar.gz) = 047f455d91f3bb452435a9ccdc6eb5823d8a8138
Size (gnats-3.113.1.tar.gz) = 1120985 bytes
SHA1 (patch-aa) = 1ffbeaf401fc678b758db76c612f57472dbffa73
SHA1 (patch-aa) = b5e56b19718bfd1099ea36a738db2fc296d24625
SHA1 (patch-ab) = 71ef64a0ec6b657f7d3ed07b87417d249be78c3f
SHA1 (patch-ac) = 96e1a9fef3110bf1bb543c036c6f435f9a64d0ac

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.1.1.1 2003/10/13 23:23:34 jeremy-c-reed Exp $
$NetBSD: patch-aa,v 1.2 2008/09/28 14:25:57 cheusov Exp $
--- Makefile.in.orig 2001-05-08 10:22:21.000000000 -0700
+++ Makefile.in 2003-10-13 15:19:01.000000000 -0700
@@ -67,12 +67,13 @@
--- Makefile.in.orig 2001-05-08 20:22:21.000000000 +0300
+++ Makefile.in
@@ -67,12 +67,13 @@ TEXIDIR = $(srcdir)/../texinfo
# Where to find sundry TeX/Texinfo files
TEXINPUTS = $(srcdir):$(srcdir)/../gnats:$(srcdir)/../send-pr:$(TEXIDIR)
@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/13 23:23:34 jeremy-c-reed Exp $
CFLAGS = -g
LDFLAGS = -g
@@ -130,14 +131,14 @@
@@ -130,14 +131,14 @@ all: send-pr install-sid send-pr.el send
send-pr: send-pr.sh Makefile
sed -e 's,xVERSIONx,$(VERSION),' \
-e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \
@ -35,7 +35,42 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/13 23:23:34 jeremy-c-reed Exp $
-e 's,xDATADIRx,$(datadir),' $(srcdir)/send-pr.sh > $@-t
mv $@-t $@
chmod 755 $@
@@ -266,7 +267,7 @@
@@ -174,19 +175,19 @@ install-gnats-arch-dep: install-norm-arc
install-norm all-gnats: install-norm-arch-indep install-norm-arch-dep
install-norm-arch-indep:
- $(INSTALL_DATA) send-pr.el $(lispdir)/send-pr.el
+ $(INSTALL_DATA) send-pr.el ${DESTDIR}$(lispdir)/send-pr.el
if [ -f send-pr.elc ]; then \
- $(INSTALL_DATA) send-pr.elc $(lispdir)/send-pr.elc; \
+ $(INSTALL_DATA) send-pr.elc ${DESTDIR}$(lispdir)/send-pr.elc; \
else true; fi
install-norm-arch-dep:
- $(INSTALL_SCRIPT) send-pr $(bindir)/send-pr
- $(INSTALL_SCRIPT) install-sid $(bindir)/install-sid
- $(INSTALL_DATA) send-pr.1 $(man1dir)/send-pr.1
+ $(INSTALL_SCRIPT) send-pr ${DESTDIR}$(bindir)/send-pr
+ $(INSTALL_SCRIPT) install-sid ${DESTDIR}$(bindir)/install-sid
+ $(INSTALL_DATA) send-pr.1 ${DESTDIR}$(man1dir)/send-pr.1
# Install the Cygnus category list for bug reports.
install-categories:
- $(INSTALL_DATA) $(srcdir)/categories $(datadir)/gnats/cygnus
+ $(INSTALL_DATA) $(srcdir)/categories ${DESTDIR}$(datadir)/gnats/cygnus
install-gnats-dist:
$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gnats/dist
@@ -239,7 +240,7 @@ install-gnats-dist:
install-info: send-pr.info
for i in send-pr.info* ; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i ; \
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i ; \
done
uninstall:
@@ -266,7 +267,7 @@ send-pr.1: Makefile
mv $@-t $@
send-pr.info: send-pr.texi version.texi fields.texi s-usage.texi categ.texi