From 39a936dd35f0f49b1dfb29e61a93a5f6e181d4a3 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 15 Dec 1999 21:58:47 +0000 Subject: [PATCH] - remove deprecated variables - remove pre-configure target - remove workaround for texinfo install-info bug - add removal of info files into ghsar+gunshar's Makefile before they are recreated - split out patch-aa into patch-aa and patch-ab, patches are supposed to only patch one file each - rearrange PLIST a bit --- archivers/gshar+gunshar/Makefile | 20 ++---- archivers/gshar+gunshar/patches/patch-aa | 80 +----------------------- archivers/gshar+gunshar/patches/patch-ab | 76 ++++++++++++++++++++++ archivers/gshar+gunshar/patches/patch-ad | 23 +++++++ archivers/gshar+gunshar/pkg/PLIST | 8 +-- 5 files changed, 111 insertions(+), 96 deletions(-) create mode 100644 archivers/gshar+gunshar/patches/patch-ab create mode 100644 archivers/gshar+gunshar/patches/patch-ad diff --git a/archivers/gshar+gunshar/Makefile b/archivers/gshar+gunshar/Makefile index 71f494dbef6..fa5360cd675 100644 --- a/archivers/gshar+gunshar/Makefile +++ b/archivers/gshar+gunshar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1999/09/06 17:15:07 brad Exp $ +# $OpenBSD: Makefile,v 1.7 1999/12/15 21:58:47 brad Exp $ DISTNAME= sharutils-4.2 CATEGORIES= archivers @@ -15,20 +15,12 @@ CONFIGURE_ARGS= --program-prefix=g --disable-uucode --disable-nls INSTALL_TARGET= install install-man post-patch: - @${TOUCH} ${WRKSRC}/po/sharutils.pot - -pre-configure: - @${RM} -f ${WRKSRC}/doc/*.info* + @touch ${WRKSRC}/po/sharutils.pot post-install: -.for file in gshar gunshar - @${STRIP} ${PREFIX}/bin/${file} -.endfor - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi -.for info in remsync.info sharutils.info - @install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir -.endfor + @strip ${PREFIX}/bin/gshar + @strip ${PREFIX}/bin/gunshar + @install-info ${PREFIX}/info/remsync.info ${PREFIX}/info/dir + @install-info ${PREFIX}/info/sharutils.info ${PREFIX}/info/dir .include diff --git a/archivers/gshar+gunshar/patches/patch-aa b/archivers/gshar+gunshar/patches/patch-aa index 079f71e29f0..2f5cce3a1fc 100644 --- a/archivers/gshar+gunshar/patches/patch-aa +++ b/archivers/gshar+gunshar/patches/patch-aa @@ -1,5 +1,5 @@ ---- doc/remsync.texi.orig Sun Jun 8 22:59:35 1997 -+++ doc/remsync.texi Sun Jun 8 23:02:50 1997 +--- doc/remsync.texi.orig Thu Nov 30 18:15:37 1995 ++++ doc/remsync.texi Tue Dec 14 22:37:13 1999 @@ -2,6 +2,11 @@ @c %**start of header @setfilename remsync.info @@ -12,79 +12,3 @@ @finalout @setchapternewpage odd @c %**end of header ---- doc/sharutils.texi.orig Sun Jun 8 22:59:41 1997 -+++ doc/sharutils.texi Sun Jun 8 23:10:37 1997 -@@ -2,6 +2,16 @@ - @c %**start of header - @setfilename sharutils.info - @settitle GNU @code{shar} utilities -+@dircategory File transfer and archiving tools -+@direntry -+* Shar utilities: (sharutils). GNU shar utilities. -+* mail-files: (sharutils)mail-files invocation. Send files to remote site. -+* mailshar: (sharutils)mailshar invocation. Make and send a shell archive. -+* shar: (sharutils)shar invocation. Make a shell archive. -+* unshar: (sharutils)unshar invocation. Explode a shell archive. -+* uudecode: (sharutils)uudecode invocation. Restore file from 7-bits. -+* uuencode: (sharutils)uuencode invocation. Force binary file to 7-bits. -+@end direntry - @finalout - @c %**end of header - -@@ -15,21 +26,6 @@ - @end tex - - @ifinfo --@format --START-INFO-DIR-ENTRY --* Shar utilities: (sharutils). GNU shar utilities. --* mail-files: (sharutils)mail-files invocation. Send files to remote site. --* mailshar: (sharutils)mailshar invocation. Make and send a shell archive. --* remsync: (sharutils)remsync invocation. Synchronize remote files. --* shar: (sharutils)shar invocation. Make a shell archive. --* unshar: (sharutils)unshar invocation. Explode a shell archive. --* uudecode: (sharutils)uudecode invocation. Restore file from 7-bits. --* uuencode: (sharutils)uuencode invocation. Force binary file to 7-bits. --END-INFO-DIR-ENTRY --@end format --@end ifinfo -- --@ifinfo - This file documents the GNU set of shar utilities. - - Copyright (C) 1994 Free Software Foundation, Inc. -@@ -157,8 +153,8 @@ - The format of the @code{shar} command is one of: - - @example --shar [ @var{option} ] @dots{} @var{file} @dots{} --shar -S [ @var{option} ] @dots{} -+gshar [ @var{option} ] @dots{} @var{file} @dots{} -+gshar -S [ @var{option} ] @dots{} - @end example - - In the first form, the file list is given as command arguments. In the -@@ -548,7 +544,7 @@ - The format of the @code{unshar} command is: - - @example --unshar [ @var{option} ] @dots{} [ @var{file} @dots{} ] -+gunshar [ @var{option} ] @dots{} [ @var{file} @dots{} ] - @end example - - Each @var{file} is processed in turn, as a shell archive or a -@@ -635,10 +631,10 @@ - Let us conclude by a showing a few examples of @code{shar} usage: - - @example --shar *.c > cprog.shar --shar -Q *.[ch] > cprog.shar --shar -B -l28 -oarc.sh. *.arc --shar -f /lcl/src/u*.c > u.sh -+gshar *.c > cprog.shar -+gshar -Q *.[ch] > cprog.shar -+gshar -B -l28 -oarc.sh. *.arc -+gshar -f /lcl/src/u*.c > u.sh - @end example - - @noindent diff --git a/archivers/gshar+gunshar/patches/patch-ab b/archivers/gshar+gunshar/patches/patch-ab new file mode 100644 index 00000000000..596235d5139 --- /dev/null +++ b/archivers/gshar+gunshar/patches/patch-ab @@ -0,0 +1,76 @@ +--- doc/sharutils.texi.orig Fri Nov 24 21:42:52 1995 ++++ doc/sharutils.texi Tue Dec 14 22:37:13 1999 +@@ -2,6 +2,16 @@ + @c %**start of header + @setfilename sharutils.info + @settitle GNU @code{shar} utilities ++@dircategory File transfer and archiving tools ++@direntry ++* Shar utilities: (sharutils). GNU shar utilities. ++* mail-files: (sharutils)mail-files invocation. Send files to remote site. ++* mailshar: (sharutils)mailshar invocation. Make and send a shell archive. ++* shar: (sharutils)shar invocation. Make a shell archive. ++* unshar: (sharutils)unshar invocation. Explode a shell archive. ++* uudecode: (sharutils)uudecode invocation. Restore file from 7-bits. ++* uuencode: (sharutils)uuencode invocation. Force binary file to 7-bits. ++@end direntry + @finalout + @c %**end of header + +@@ -15,21 +25,6 @@ + @end tex + + @ifinfo +-@format +-START-INFO-DIR-ENTRY +-* Shar utilities: (sharutils). GNU shar utilities. +-* mail-files: (sharutils)mail-files invocation. Send files to remote site. +-* mailshar: (sharutils)mailshar invocation. Make and send a shell archive. +-* remsync: (sharutils)remsync invocation. Synchronize remote files. +-* shar: (sharutils)shar invocation. Make a shell archive. +-* unshar: (sharutils)unshar invocation. Explode a shell archive. +-* uudecode: (sharutils)uudecode invocation. Restore file from 7-bits. +-* uuencode: (sharutils)uuencode invocation. Force binary file to 7-bits. +-END-INFO-DIR-ENTRY +-@end format +-@end ifinfo +- +-@ifinfo + This file documents the GNU set of shar utilities. + + Copyright (C) 1994 Free Software Foundation, Inc. +@@ -157,8 +152,8 @@ + The format of the @code{shar} command is one of: + + @example +-shar [ @var{option} ] @dots{} @var{file} @dots{} +-shar -S [ @var{option} ] @dots{} ++gshar [ @var{option} ] @dots{} @var{file} @dots{} ++gshar -S [ @var{option} ] @dots{} + @end example + + In the first form, the file list is given as command arguments. In the +@@ -548,7 +543,7 @@ + The format of the @code{unshar} command is: + + @example +-unshar [ @var{option} ] @dots{} [ @var{file} @dots{} ] ++gunshar [ @var{option} ] @dots{} [ @var{file} @dots{} ] + @end example + + Each @var{file} is processed in turn, as a shell archive or a +@@ -635,10 +630,10 @@ + Let us conclude by a showing a few examples of @code{shar} usage: + + @example +-shar *.c > cprog.shar +-shar -Q *.[ch] > cprog.shar +-shar -B -l28 -oarc.sh. *.arc +-shar -f /lcl/src/u*.c > u.sh ++gshar *.c > cprog.shar ++gshar -Q *.[ch] > cprog.shar ++gshar -B -l28 -oarc.sh. *.arc ++gshar -f /lcl/src/u*.c > u.sh + @end example + + @noindent diff --git a/archivers/gshar+gunshar/patches/patch-ad b/archivers/gshar+gunshar/patches/patch-ad new file mode 100644 index 00000000000..eef30d8cfac --- /dev/null +++ b/archivers/gshar+gunshar/patches/patch-ad @@ -0,0 +1,23 @@ +--- doc/Makefile.in.orig Fri Nov 24 21:44:35 1995 ++++ doc/Makefile.in Wed Dec 15 16:32:21 1999 +@@ -26,7 +26,7 @@ + transform = @program_transform_name@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MAKEINFO = makeinfo ++MAKEINFO = makeinfo --no-split + TEXI2DVI = texi2dvi + TOUCH = echo timestamp > + +@@ -52,9 +52,11 @@ + all info check: sharutils.info remsync.info + + sharutils.info: sharutils.texi version.texi ++ @rm -f $(srcdir)/sharutils.info* + cd $(srcdir) && $(MAKEINFO) sharutils.texi + + remsync.info: remsync.texi version.texi ++ @rm -f $(srcdir)/remsync.info* + cd $(srcdir) && $(MAKEINFO) remsync.texi + + dvi: sharutils.dvi remsync.dvi diff --git a/archivers/gshar+gunshar/pkg/PLIST b/archivers/gshar+gunshar/pkg/PLIST index f3128332a1e..f07e147fe5c 100644 --- a/archivers/gshar+gunshar/pkg/PLIST +++ b/archivers/gshar+gunshar/pkg/PLIST @@ -1,13 +1,13 @@ -@unexec install-info --delete --info-dir=%D/info %D/info/remsync.info -@unexec install-info --delete --info-dir=%D/info %D/info/sharutils.info bin/gmail-files bin/gmailshar bin/gremsync bin/gshar bin/gunshar +@unexec install-info --delete --info-dir=%D/info %D/info/remsync.info +@unexec install-info --delete --info-dir=%D/info %D/info/sharutils.info info/remsync.info info/sharutils.info -man/man1/gshar.1 -man/man1/gunshar.1 @exec install-info --info-dir=%D/info %D/info/remsync.info @exec install-info --info-dir=%D/info %D/info/sharutils.info +man/man1/gshar.1 +man/man1/gunshar.1