diff options
| author | reed <reed@pkgsrc.org> | 2004-05-07 21:41:43 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2004-05-07 21:41:43 +0000 |
| commit | 0c0ec81fd1f2b31aa23aebaca5bd7a57c3211cdc (patch) | |
| tree | e6e5c4995f91bc0b823cee1059b68d08445f72cc /archivers | |
| parent | dac4dd3de14c03cdece8005ae0580e7bc868ce34 (diff) | |
| download | pkgsrc-0c0ec81fd1f2b31aa23aebaca5bd7a57c3211cdc.tar.gz | |
This previously didn't patch to stop installing the gzip.info file
because it was just removed after.
But now use a patch to disable the install and disable the
creation of the ${PREFIX}/info directory.
(${PREFIX}/info is wrong; pkgsrc uses ${PREFIX}/${INFO_DIR}.)
(The patch also includes the BSD_INSTALL_SCRIPT change
which was previously done in the Makefile using sed.)
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/gzip-base/Makefile | 16 | ||||
| -rw-r--r-- | archivers/gzip-base/distinfo | 3 | ||||
| -rw-r--r-- | archivers/gzip-base/patches/patch-aa | 31 |
3 files changed, 34 insertions, 16 deletions
diff --git a/archivers/gzip-base/Makefile b/archivers/gzip-base/Makefile index 9bf16904bc9..bf536935af6 100644 --- a/archivers/gzip-base/Makefile +++ b/archivers/gzip-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/03/11 18:03:50 xtraeme Exp $ +# $NetBSD: Makefile,v 1.15 2004/05/07 21:41:43 reed Exp $ # DISTNAME= gzip-1.2.4a @@ -19,18 +19,4 @@ GNU_CONFIGURE= YES BUILD_TARGET= all manlinks=so INSTALL_TARGET= install manlinks=so -do-patch: - f=${WRKSRC}/Makefile.in ; \ - [ -f $$f.orig ] || ${CP} $$f $$f.orig ; \ - ${SED} \ - '/scriptdir/s/INSTALL_PROGRAM/BSD_INSTALL_SCRIPT/' \ - < $$f.orig >$$f - -# We avoid using a patch for disabling the install of the info -# file. The easy part is that "install-info" is not called so -# we can simply remove the single installed info file. - -post-install: - -${RM} -f ${PREFIX}/info/gzip.info - .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gzip-base/distinfo b/archivers/gzip-base/distinfo index f6a8074e857..8d31efc64a7 100644 --- a/archivers/gzip-base/distinfo +++ b/archivers/gzip-base/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 11:21:05 agc Exp $ +$NetBSD: distinfo,v 1.3 2004/05/07 21:41:43 reed Exp $ SHA1 (gzip-1.2.4a.shar) = 1e1e513f48be32ecfe24c06b609329963d5a5288 Size (gzip-1.2.4a.shar) = 832431 bytes +SHA1 (patch-aa) = 449d3eb975b9ddc634ba0b3a245381f3f3e1f5e1 diff --git a/archivers/gzip-base/patches/patch-aa b/archivers/gzip-base/patches/patch-aa new file mode 100644 index 00000000000..51eb2a8ed6f --- /dev/null +++ b/archivers/gzip-base/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1 2004/05/07 21:41:43 reed Exp $ + +--- Makefile.in.orig Fri May 7 14:26:18 2004 ++++ Makefile.in +@@ -104,7 +104,7 @@ mandir = $(prefix)/man/man$(manext) + # Use manlinks=so to use the .so method instead of hard links + manlinks = ln + +-alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir) ++alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(mandir) + + #### End of system configuration section. #### + +@@ -206,7 +206,7 @@ install: installdirs installbin installm + installbin: all + $(INSTALL_PROGRAM) gzip$X $(bindir)/gzip$X + for f in $(SCRIPTS); do \ +- $(INSTALL_PROGRAM) $${f} $(scriptdir)/$${f}; done ++ $(BSD_INSTALL_SCRIPT) $${f} $(scriptdir)/$${f}; done + rm -f $(scriptdir)/$(G)zcmp; \ + ln $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp + for f in gunzip$X ungzip$X $(ZCAT)$X ; do \ +@@ -237,8 +237,6 @@ installman: gzip.info + ln $(G)zdiff.$(manext) $(G)zcmp.$(manext);\ + ln gzip.$(manext) gunzip.$(manext);\ + fi +- -cd $(srcdir); for f in gzip.info* ; do $(INSTALL_DATA) $${f} \ +- $(infodir)/$${f}; done + + uninstall: force + -cd $(bindir); rm -f gzip$X gunzip$X $(ZCAT)$X |