From edfa0ccf72b78537bbb45164674d7464f8b3620a Mon Sep 17 00:00:00 2001 From: fgsch Date: Wed, 10 Nov 1999 05:48:03 +0000 Subject: [PATCH] Remove unneeded post installation code. Fix patch so info/dir is not overwritten; noticed by mah@everybody.org. --- sysutils/mtools/Makefile | 13 ++++--------- sysutils/mtools/patches/patch-aa | 27 ++++++--------------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index c2ab8e43740..3a24c746942 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,13 +1,14 @@ -# $OpenBSD: Makefile,v 1.14 1999/11/08 06:22:37 fgsch Exp $ +# $OpenBSD: Makefile,v 1.15 1999/11/10 05:48:03 fgsch Exp $ +DATE= 19991012 DISTNAME= mtools-3.9.6 -PKGNAME= mtools-3.9.6-1012 +PKGNAME= mtools-3.9.6-${DATE} CATEGORIES= sysutils DIST_SUBDIR= mtools MASTER_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/ PATCH_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/ -PATCHFILES= mtools-3.9.6-19991012.diff.gz +PATCHFILES= mtools-3.9.6-${DATE}.diff.gz MAINTAINER= fgsch@openbsd.org @@ -20,10 +21,4 @@ pre-patch: post-patch: @${RM} ${WRKSRC}/mtools -post-install: - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi - @install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir - .include diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa index 358decd0c3b..9920c3178e9 100644 --- a/sysutils/mtools/patches/patch-aa +++ b/sysutils/mtools/patches/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Jul 1 13:21:58 1999 -+++ Makefile.in Fri Jul 9 00:08:05 1999 +--- Makefile.in.orig Thu Jul 1 14:21:58 1999 ++++ Makefile.in Wed Nov 10 02:27:02 1999 @@ -25,7 +25,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ @@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ infodir = @infodir@ -@@ -47,10 +47,10 @@ +@@ -47,10 +47,11 @@ MACHDEPLIBS = @MACHDEPLIBS@ LN_S = @LN_S@ @@ -21,26 +21,11 @@ +INSTALL_DATA = ${BSD_INSTALL_DATA} +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} +INSTALL_MAN = ${BSD_INSTALL_MAN} ++INSTALL_INFO = @INSTALL_INFO@ .SUFFIXES: .SUFFIXES: .o .c -@@ -195,12 +195,12 @@ - $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ - done; \ - fi; \ -- if [ -n "$(INSTALL_INFO)" ] ; then \ -+ if [ -n "$(INSTALL_DATA)" ] ; then \ - if [ -f $(infodir)/dir.info ] ; then \ -- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ -+ $(INSTALL_DATA) $(infodir)/mtools.info $(infodir)/dir.info; \ - fi; \ - if [ -f $(infodir)/dir ] ; then \ -- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ -+ $(INSTALL_DATA) $(infodir)/mtools.info $(infodir)/dir; \ - fi; \ - fi - -@@ -248,7 +248,7 @@ +@@ -248,7 +249,7 @@ install-scripts: $(bindir)/mtools @$(top_srcdir)/mkinstalldirs $(bindir) @for j in $(SCRIPTS) ; do \ @@ -49,7 +34,7 @@ echo $(bindir)/$$j ; \ done rm -f $(bindir)/lz -@@ -257,12 +257,12 @@ +@@ -257,12 +258,12 @@ install-man: @$(top_srcdir)/mkinstalldirs $(MAN1DIR) @for j in $(MAN1); do \