Reengineer for NetBSD.

6 files changed, 102 insertions, 115 deletions

diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 293af57e690..f816567f03e 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,35 +1,18 @@
-# New ports collection makefile for:    gshar+gunshar
-# Version required:     4.2
-# Date created:         28 Dec 1994
-# Whom:                 ache
-#
-# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:03 fenner Exp
-#
+# $NetBSD: Makefile,v 1.2 1999/05/23 20:33:46 tv Exp $
 
-DISTNAME=       sharutils-4.2
+DISTNAME=	sharutils-4.2
+PKGNAME=	g${DISTNAME}
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	sharutils
+MASTER_SITES=	${MASTER_SITE_GNU:=sharutils/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --program-prefix=g --disable-uucode
+CONFIGURE_ARGS= --program-prefix=g --disable-uucode --with-gnu-gettext
 INSTALL_TARGET= install install-man
-MAN1=		gshar.1 gunshar.1
+INFO_FILES=	remsync.info sharutils.info
 
 post-patch:
-	@touch ${WRKSRC}/po/sharutils.pot
+	@${TOUCH} ${TOUCH_FLAGS} ${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
-
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gsharutils/files/md5 b/archivers/gsharutils/files/md5
index eacc64495d1..d0d32e23457 100644
--- a/archivers/gsharutils/files/md5
+++ b/archivers/gsharutils/files/md5
@@ -1 +1,3 @@
+$NetBSD: md5,v 1.2 1999/05/23 20:33:46 tv Exp $
+
 MD5 (sharutils-4.2.tar.gz) = b1ab1d10d88e8dcb8ee5b0d06b2fc073
diff --git a/archivers/gsharutils/patches/patch-aa b/archivers/gsharutils/patches/patch-aa
index 079f71e29f0..671780fb06b 100644
--- a/archivers/gsharutils/patches/patch-aa
+++ b/archivers/gsharutils/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.2 1999/05/23 20:33:46 tv Exp $
+
 --- doc/remsync.texi.orig	Sun Jun  8 22:59:35 1997
 +++ doc/remsync.texi	Sun Jun  8 23:02:50 1997
 @@ -2,6 +2,11 @@
@@ -12,79 +14,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/gsharutils/patches/patch-ab b/archivers/gsharutils/patches/patch-ab
new file mode 100644
index 00000000000..d65ae52b389
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-ab
@@ -0,0 +1,78 @@
+$NetBSD: patch-ab,v 1.1 1999/05/23 20:33:46 tv Exp $
+
+--- 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/gsharutils/patches/patch-ac b/archivers/gsharutils/patches/patch-ac
index ae683ed43e9..7b145a25917 100644
--- a/archivers/gsharutils/patches/patch-ac
+++ b/archivers/gsharutils/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.2 1999/05/23 20:33:46 tv Exp $
+
 --- src/shar.c.orig	Sun Jun  8 22:47:22 1997
 +++ src/shar.c	Sun Jun  8 22:47:37 1997
 @@ -688,7 +688,7 @@
diff --git a/archivers/gsharutils/pkg/PLIST b/archivers/gsharutils/pkg/PLIST
index cf2b1b8e64f..f3978d11e44 100644
--- a/archivers/gsharutils/pkg/PLIST
+++ b/archivers/gsharutils/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1999/05/23 20:33:46 tv Exp $
 bin/gmail-files
 bin/gmailshar
 bin/gremsync
@@ -7,18 +8,13 @@ bin/gunshar
 @unexec install-info --delete %D/info/remsync.info %D/info/dir
 info/sharutils.info
 info/remsync.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/sharutils.info %D/info/dir
 @exec install-info %D/info/remsync.info %D/info/dir
-lib/locale/de/LC_MESSAGES/sharutils.cat
-lib/locale/fr/LC_MESSAGES/sharutils.cat
-lib/locale/ja_JP.EUC/LC_MESSAGES/sharutils.cat
-lib/locale/nl/LC_MESSAGES/sharutils.cat
-lib/locale/pt/LC_MESSAGES/sharutils.cat
-lib/locale/sv/LC_MESSAGES/sharutils.cat
-share/locale/de.gmo/LC_MESSAGES/sharutils.cat
-share/locale/fr.gmo/LC_MESSAGES/sharutils.cat
-share/locale/ja_JP.EUC.gmo/LC_MESSAGES/sharutils.cat
-share/locale/nl.gmo/LC_MESSAGES/sharutils.cat
-share/locale/pt.gmo/LC_MESSAGES/sharutils.cat
-share/locale/sv.gmo/LC_MESSAGES/sharutils.cat
+man/man1/gshar.1
+man/man1/gunshar.1
+share/locale/de/LC_MESSAGES/sharutils.mo
+share/locale/fr/LC_MESSAGES/sharutils.mo
+share/locale/ja_JP.EUC/LC_MESSAGES/sharutils.mo
+share/locale/nl/LC_MESSAGES/sharutils.mo
+share/locale/pt/LC_MESSAGES/sharutils.mo
+share/locale/sv/LC_MESSAGES/sharutils.mo