Update to 1.3.

2001-05-06 21:52:45 +00:00 · 2001-05-06 21:52:45 +00:00 · 64084423d5
commit 64084423d5
parent 250241a3dd
16 changed files with 337 additions and 93 deletions
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@ -1,37 +1,52 @@
-# $OpenBSD: Makefile,v 1.3 2001/04/20 17:35:35 brad Exp $
+# $OpenBSD: Makefile,v 1.4 2001/05/06 21:52:45 naddy Exp $
 # $FreeBSD: Makefile,v 1.7 1998/12/24 13:15:23 dirk Exp $

 COMMENT=	"unique standard tape archiver with many enhancements"

-DISTNAME=	star-1.2
+DISTNAME=	star-1.3
 CATEGORIES=	archivers sysutils
-NEED_VERSION=	1.384
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/compress
+NEED_VERSION=	1.405

 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>

+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/ \
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= utils/compress
+
+FLAVORS=	static
+FLAVOR?=
+
 USE_GMAKE=	Yes
-MAKE_ENV=	MAKEPROG="${GMAKE}" CCOM="${CC}"
+MAKE_ENV=	MAKEPROG="${MAKEPROG}" CCOM="${CC}" SYSCONFDIR="${SYSCONFDIR}"
+
+.if ${FLAVOR:L:Mstatic}
+MAKE_ENV+=	LDFLAGS=-static
+.endif

 .if ${MACHINE} != "i386" || ${CC} != "cc"
 do-configure:
-	@rm -f ${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
-	@cp ${WRKSRC}/RULES/i386-openbsd-cc.rul \
-	    ${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
+	@ln -sf ${WRKSRC}/RULES/i386-openbsd-cc.rul \
+		${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
 .endif

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/star/OBJ/${MACHINE}-openbsd-${CC}/star \
-	    ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/star/OBJ/${MACHINE}-openbsd-${CC}/star \
+		${PREFIX}/bin/star
 	cd ${PREFIX}/bin; ln -sf star ustar
-	${INSTALL_MAN} ${WRKSRC}/star/star.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/star/star.1 ${PREFIX}/man/man1/star.1
 	cd ${PREFIX}/man/man1; ln -sf star.1 ustar.1
+	${INSTALL_PROGRAM} ${WRKBUILD}/rmt/OBJ/${MACHINE}-openbsd-${CC}/rmt \
+		${PREFIX}/libexec/srmt
+	perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},g' ${WRKSRC}/rmt/rmt.1
+	${INSTALL_MAN} ${WRKSRC}/rmt/rmt.1 ${PREFIX}/man/man8/srmt.8
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/star
+	${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl \
+		${PREFIX}/share/examples/star/srmt.conf.sample

 .include <bsd.port.mk>
--- a/archivers/star/files/md5
+++ b/archivers/star/files/md5
@ -1,3 +1,3 @@
-MD5 (star-1.2.tar.gz) = a49261837f2aa99355db3fae57d617ac
-RMD160 (star-1.2.tar.gz) = 1d8017a08899978cdfd7a49753c6bbdf53e91f73
-SHA1 (star-1.2.tar.gz) = 2a5ca180b072d0e6b8bd98473f7dc6c448fa41c6
+MD5 (star-1.3.tar.gz) = 692625a76ba5e52bd62312ebb6eff7ac
+RMD160 (star-1.3.tar.gz) = d6b64fc1ad19efea966726d6bb7b9ab42180802e
+SHA1 (star-1.3.tar.gz) = 5815d17cdff76019ea7d5050408fe8c7ce350e2f
--- a/archivers/star/patches/patch-RULES_i386-openbsd-cc_rul
+++ b/archivers/star/patches/patch-RULES_i386-openbsd-cc_rul
@ -1,15 +1,22 @@
-$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
--- RULES/i386-openbsd-cc.rul.orig	Tue Jul  8 17:37:45 1997
-+++ RULES/i386-openbsd-cc.rul	Sun Oct  1 23:09:57 2000
-@@ -24,7 +24,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
+$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.2 2001/05/06 21:52:45 naddy Exp $
+--- RULES/i386-openbsd-cc.rul.orig	Wed Nov 15 20:02:50 2000
+++ RULES/i386-openbsd-cc.rul	Wed Nov 15 20:04:40 2000
+@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
 ###########################################################################
 
 CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
 -CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-+CFLAGS+=	$(COPTS) $(CWARNOPTS) $(COPTX)
+CFLAGS+=	$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
 
 CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
 COPTS=
+ CWOPTS=		-Wall -Wtraditional \
+ 		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
+-COPTOPT=	-O
+COPTOPT=
+ KDEFINES=	-DKERNEL -D_KERNEL
+ COPTDYN=	-fpic
+ COPTGPROF=	-pg
@@ -47,7 +47,7 @@ LIB_KVM=	
 
 LIBS_PATH=	-L$(OLIBSDIR)
@ -26,15 +33,15 @@ $OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.1.1.1 2000/10/01 21:15:49 naddy Ex
 -CC=		@echo "	==> COMPILING \"$@\""; gcc
 -LDCC=		@echo "	==> LINKING \"$@\""; gcc
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
-+CC=		@echo "	==> COMPILING \"$@\""; ${CCOM}
-+LDCC=		@echo "	==> LINKING \"$@\""; ${CCOM}
-+DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; ${CCOM}
+CC=		@echo "	==> COMPILING \"$@\""; $(CCOM)
+LDCC=		@echo "	==> LINKING \"$@\""; $(CCOM)
+DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; $(CCOM)
 RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
 ARFLAGS=	cr
 LORDER=		lorder
 TSORT=		tsort
 
 RMDEP=		:
-MKDEP=		@echo "	==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		@echo "	==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); ${CCOM} -M
+-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CCOM) -M
 MKDEP_OUT=
--- a/archivers/star/patches/patch-RULES_rules1_top
+++ b/archivers/star/patches/patch-RULES_rules1_top
@ -0,0 +1,12 @@
+$OpenBSD: patch-RULES_rules1_top,v 1.1 2001/05/06 21:52:46 naddy Exp $
+--- RULES/rules1.top.orig	Wed Nov 15 18:39:18 2000
+++ RULES/rules1.top	Wed Nov 15 18:39:55 2000
+@@ -186,7 +186,7 @@ __PARCH=	$(_PARCH:$(_UNIQ)=$(PARCH_DEF))
+ PARCH=		$(__PARCH:$(_UNIQ)%=%)
+ 
+ #OARCH=		$(MARCH)$(-O_ARCH)-$(C_ARCH)
+-OARCH=		$(PARCH)$(-O_ARCH)-$(C_ARCH)
+OARCH=		$(K_ARCH)$(-O_ARCH)-$(C_ARCH)
+ XARCH=		$(K_ARCH)$(-O_ARCH)-$(C_ARCH)
+ .print:
+ 	echo $(XP_ARCH) $(P_ARCH)
--- a/archivers/star/patches/patch-RULES_rules_top
+++ b/archivers/star/patches/patch-RULES_rules_top
@ -1,12 +0,0 @@
-$OpenBSD: patch-RULES_rules_top,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
--- RULES/rules.top.orig	Sun Apr 27 01:47:38 1997
-+++ RULES/rules.top	Sun Oct  1 23:09:58 2000
-@@ -151,7 +151,7 @@ __PARCH=	$(_PARCH:$(_UNIQ)=$(PARCH_DEF))
- PARCH=		$(__PARCH:$(_UNIQ)%=%)
- 
- #OARCH=		$(MARCH)$(-O_ARCH)-$(C_ARCH)
-OARCH=		$(PARCH)$(-O_ARCH)-$(C_ARCH)
-+OARCH=		$(K_ARCH)$(-O_ARCH)-$(C_ARCH)
- XARCH=		$(K_ARCH)$(-O_ARCH)-$(C_ARCH)
- .print:
- 	echo $(XP_ARCH) $(P_ARCH)
--- a/archivers/star/patches/patch-include_standard_h
+++ b/archivers/star/patches/patch-include_standard_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-include_standard_h,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
--- include/standard.h.orig	Sun Jan 26 12:49:31 1997
-+++ include/standard.h	Sun Oct  1 23:09:58 2000
-@@ -182,7 +182,7 @@ extern	void	setfp __PR((void * const *))
- extern	int	wait_chld __PR((int));
- extern	int	geterrno __PR((void));
- extern	void	raisecond __PR((const char *, long));
-extern	int	snprintf __PR((char *, unsigned, const char *, ...));
-+/*extern	int	snprintf __PR((char *, unsigned, const char *, ...));*/
- /*extern	int	sprintf __PR((char *, const char *, ...)); ist woanders falsch deklariert !!!*/
- extern	char	*strcatl __PR((char *, ...));
- extern	int	streql __PR((const char *, const char *));
--- a/archivers/star/patches/patch-mt_Makefile
+++ b/archivers/star/patches/patch-mt_Makefile
@ -0,0 +1,12 @@
+$OpenBSD: patch-mt_Makefile,v 1.1 2001/05/06 21:52:46 naddy Exp $
+--- mt/Makefile.orig	Wed Nov 15 21:29:12 2000
+++ mt/Makefile	Wed Nov 15 21:29:31 2000
+@@ -8,7 +8,7 @@ include		$(SRCROOT)/$(RULESDIR)/rules.to
+ INSDIR=		bin
+ TARGET=		mt
+ HARDLINKS=	smt
+-CPPOPTS +=	-I../star/ -DUSE_REMOTE
+CPPOPTS +=	-I../star/ -DUSE_REMOTE -DDEFTAPE=\"/dev/rst0\"
+ CFILES=		mt.c remote.c
+ #HFILES=
+ LIBS=		-lschily $(LIB_SOCKET)
--- a/archivers/star/patches/patch-rmt_Makefile
+++ b/archivers/star/patches/patch-rmt_Makefile
@ -0,0 +1,12 @@
+$OpenBSD: patch-rmt_Makefile,v 1.1 2001/05/06 21:52:46 naddy Exp $
+--- rmt/Makefile.orig	Sun May  6 21:45:01 2001
+++ rmt/Makefile	Sun May  6 21:45:24 2001
+@@ -7,7 +7,7 @@ include		$(SRCROOT)/$(RULESDIR)/rules.to
+ 
+ INSDIR=		sbin
+ TARGET=		rmt
+-CPPOPTS +=	-DUSE_REMOTE
+CPPOPTS +=	-DUSE_REMOTE -DSYSCONFDIR=\"$(SYSCONFDIR)\"
+ CFILES=		rmt.c
+ #HFILES=
+ LIBS=		-ldeflt -lschily $(LIB_SOCKET)
--- a/archivers/star/patches/patch-rmt_rmt_1
+++ b/archivers/star/patches/patch-rmt_rmt_1
@ -0,0 +1,60 @@
+$OpenBSD: patch-rmt_rmt_1,v 1.1 2001/05/06 21:52:46 naddy Exp $
+--- rmt/rmt.1.orig	Tue Nov 14 22:53:56 2000
+++ rmt/rmt.1	Sun May  6 22:56:14 2001
+@@ -13,13 +13,11 @@
+ .if n .ds o oe
+ .if n .ds u ue
+ .if n .ds s sz
+-.TH RMT 1 "Release 1.1" "J\*org Schilling" "Schily\'s USER COMMANDS"
+.TH SRMT 8 "Release 1.1" "J\*org Schilling" "Schily\'s USER COMMANDS"
+ .SH NAME
+-rmt \- remote magnetic tape protocol server
+srmt \- remote magnetic tape protocol server
+ .SH SYNOPSIS
+-.B /opt/schily/sbin/rmt
+-.br
+-.B /etc/rmt
+.B srmt
+ 
+ .SH DESCRIPTION
+ .IX  "rmt command"  ""  "\fLrmt\fP \(em remote magnetic tape protocol server"
+@@ -31,10 +29,10 @@ version of the 
+ remote tape server program.
+ .B rmt
+ is a program used by programs like
+-.B star 
+.BR star (1)
+ and
+-.B ufsdump 
+-hat like to access remote magnetic tape drives and files
+.BR dump (8)
+that like to access remote magnetic tape drives and files
+ through an interprocess communication connection.
+ .B rmt
+ is normally started up with an
+@@ -441,8 +439,8 @@ Any other command causes
+ to exit.
+ .SH FILES
+ .TP
+-/etc/default/rmt
+-Default values can be set for the following options in /etc/default/rmt.
+%%SYSCONFDIR%%/srmt.conf
+Default values can be set for the following options in %%SYSCONFDIR%%/srmt.conf.
+ For example:
+ .SM USER=tape
+ .RS
+@@ -490,12 +488,12 @@ This implementation of
+ adds some security features to the server that make it behave
+ slightly different from older implementations.
+ Read the documentation about the file 
+-/etc/default/rmt
+%%SYSCONFDIR%%/srmt.conf
+ to make sure your local installation is configured for your needs.
+ .LP
+ To grant the same permissions as with the old
+ .B rmt
+-servers, create a file /etc/default/rmt and add the following lines
+servers, create a file %%SYSCONFDIR%%/rmt.conf and add the following lines
+ to this file:
+ .LP
+ .BR USER= *
--- a/archivers/star/patches/patch-rmt_rmt_c
+++ b/archivers/star/patches/patch-rmt_rmt_c
@ -0,0 +1,15 @@
+$OpenBSD: patch-rmt_rmt_c,v 1.1 2001/05/06 21:52:46 naddy Exp $
+--- rmt/rmt.c.orig	Sun May  6 21:44:04 2001
+++ rmt/rmt.c	Sun May  6 21:47:40 2001
+@@ -133,9 +133,9 @@ main(argc, argv)
+ 	 * is required. If we are not root and there is no /etc/default/rmt
+ 	 * we will only allow to access files in /dev (see below).
+ 	 */
+-	if (defltopen("/etc/default/rmt") < 0) {
+	if (defltopen(SYSCONFDIR "/srmt.conf") < 0) {
+ 		if (geteuid() == 0) {
+-			rmterror("Remote configuration error: Cannot open /etc/default/rmt");
+			rmterror("Remote configuration error: Cannot open " SYSCONFDIR "/srmt.conf");
+ 			exit(EX_BAD);
+ 		}
+ 	} else {
--- a/archivers/star/patches/patch-star_star_1
+++ b/archivers/star/patches/patch-star_star_1
@ -1,6 +1,6 @@
-$OpenBSD: patch-star_star_1,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
--- star/star.1.orig	Tue Jun 23 02:41:37 1998
-+++ star/star.1	Sun Oct  1 23:09:59 2000
+$OpenBSD: patch-star_star_1,v 1.2 2001/05/06 21:52:46 naddy Exp $
+--- star/star.1.orig	Thu Nov  9 09:19:34 2000
+++ star/star.1	Wed Nov 15 19:49:55 2000
@@ -15,10 +15,18 @@
 .if n .ds s sz
 .TH STAR 1 "Release 1.1" "J\*org Schilling" "Schily\'s USER COMMANDS"
--- a/archivers/star/patches/patch-star_star_c
+++ b/archivers/star/patches/patch-star_star_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
--- star/star.c.orig	Sun Nov  9 15:26:20 1997
-+++ star/star.c	Sun Oct  1 23:09:58 2000
-@@ -403,44 +403,46 @@ LOCAL void
+$OpenBSD: patch-star_star_c,v 1.2 2001/05/06 21:52:46 naddy Exp $
+--- star/star.c.orig	Fri Apr 27 19:29:55 2001
+++ star/star.c	Fri Apr 27 19:33:54 2001
+@@ -442,46 +442,48 @@ LOCAL void
 usage(ret)
 	int	ret;
 {
@ -11,7 +11,7 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 -	error("\t-x/-t/-n\textract/list/trace named files from tape\n");
 -	error("\t-diff\t\tdiff archive against file system (see -xhelp)\n");
 -	error("Options:\n");
-	error("\t-help,-h\tprint this help\n");
+-	error("\t-help\t\tprint this help\n");
 -	error("\t-xhelp\t\tprint extended help\n");
 -	error("\tblocks=#,b=#\tset blocking factor to #x512 Bytes (default 20)\n"); 
 -	error("\tfile=nm,f=nm\tuse 'nm' as tape instead of stdin/stdout\n");
@ -24,15 +24,15 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 +	fprintf(fp, "\t-x/-t/-n\textract/list/trace named files from tape\n");
 +	fprintf(fp, "\t-diff\t\tdiff archive against file system (see -xhelp)\n");
 +	fprintf(fp, "Options:\n");
-+	fprintf(fp, "\t-help,-h\tprint this help\n");
+	fprintf(fp, "\t-help\t\tprint this help\n");
 +	fprintf(fp, "\t-xhelp\t\tprint extended help\n");
 +	fprintf(fp, "\tblocks=#,b=#\tset blocking factor to #x512 Bytes (default 20)\n"); 
 +	fprintf(fp, "\tfile=nm,f=nm\tuse 'nm' as tape instead of stdin/stdout\n");
 +	fprintf(fp, "\t-T\t\tuse $TAPE as tape instead of stdin/stdout\n");
 #ifdef	FIFO
-	error("\t-fifo/-no_fifo\tuse/don't use a fifo to optimize data flow from/to tape\n");
-+	fprintf(fp, "\t-fifo/-no_fifo\tuse/don't use a fifo to optimize data flow from/to tape\n");
- #if defined(USE_MMAP) && defined(USE_SHM)
+-	error("\t-fifo/-no-fifo\tuse/don't use a fifo to optimize data flow from/to tape\n");
+	fprintf(fp, "\t-fifo/-no-fifo\tuse/don't use a fifo to optimize data flow from/to tape\n");
+ #if defined(USE_MMAP) && defined(USE_USGSHM)
 -	error("\t-shm\t\tuse SysV shared memory for fifo\n");
 +	fprintf(fp, "\t-shm\t\tuse SysV shared memory for fifo\n");
 #endif
@ -42,6 +42,7 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 -	error("\tH=header\tgenerate 'header' type archive (see H=help)\n");
 -	error("\tC=dir\t\tperform a chdir to 'dir' before storing next file\n");
 -	error("\t-z\t\tpipe input/output through gzip, does not work on tapes\n");
+-	error("\t-bz\t\tpipe input/output through bzip2, does not work on tapes\n");
 -	error("\t-B\t\tperform multiple reads (needed on pipes)\n");
 -	error("\t-i\t\tignore checksum errors\n");
 -	error("\t-d\t\tdo not store/create directories\n");
@ -53,16 +54,18 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 -	error("\t-L\t\tfollow symbolic links as if they were files\n");
 -	error("\t-D\t\tdo not descend directories\n");
 -	error("\t-M\t\tdo not descend mounting points\n");
-	error("\t-I\t\tdo interactive creation/extraction/renaming\n");
+-	error("\t-I,-w\t\tdo interactive creation/extraction/renaming\n");
 -	error("\t-O\t\tbe compatible to old tar (except for checksum bug)\n");
 -	error("\t-P\t\tlast record may be partial (useful on cartridge tapes)\n");
 -	error("\t-S\t\tdo not store/create special files\n");
+-	error("\t-F,-FF,-FFF,...\tdo not store/create SCCS/RCS, core and object files\n");
 -	error("\t-U\t\trestore files unconditionally\n");
 +	fprintf(fp, "\t-v\t\tbe verbose\n");
 +	fprintf(fp, "\t-tpath\t\tuse with -t to list path names only\n");
 +	fprintf(fp, "\tH=header\tgenerate 'header' type archive (see H=help)\n");
 +	fprintf(fp, "\tC=dir\t\tperform a chdir to 'dir' before storing next file\n");
 +	fprintf(fp, "\t-z\t\tpipe input/output through gzip, does not work on tapes\n");
+	fprintf(fp, "\t-bz\t\tpipe input/output through bzip2, does not work on tapes\n");
 +	fprintf(fp, "\t-B\t\tperform multiple reads (needed on pipes)\n");
 +	fprintf(fp, "\t-i\t\tignore checksum errors\n");
 +	fprintf(fp, "\t-d\t\tdo not store/create directories\n");
@ -74,15 +77,16 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 +	fprintf(fp, "\t-L\t\tfollow symbolic links as if they were files\n");
 +	fprintf(fp, "\t-D\t\tdo not descend directories\n");
 +	fprintf(fp, "\t-M\t\tdo not descend mounting points\n");
-+	fprintf(fp, "\t-I\t\tdo interactive creation/extraction/renaming\n");
+	fprintf(fp, "\t-I,-w\t\tdo interactive creation/extraction/renaming\n");
 +	fprintf(fp, "\t-O\t\tbe compatible to old tar (except for checksum bug)\n");
 +	fprintf(fp, "\t-P\t\tlast record may be partial (useful on cartridge tapes)\n");
 +	fprintf(fp, "\t-S\t\tdo not store/create special files\n");
+	fprintf(fp, "\t-F,-FF,-FFF,...\tdo not store/create SCCS/RCS, core and object files\n");
 +	fprintf(fp, "\t-U\t\trestore files unconditionally\n");
 	exit(ret);
 	/* NOTREACHED */
 }
-@@ -449,52 +451,54 @@ LOCAL void
+@@ -490,56 +492,58 @@ LOCAL void
 xusage(ret)
 	int	ret;
 {
@ -92,7 +96,8 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 -	error("\t-not,-V\t\tuse those files which do not match pattern\n");
 -	error("\tVOLHDR=name\tuse name to generate a volume header\n");
 -	error("\t-xdir\t\textract dir even if the current is never\n");
-	error("\t-keep_old_files,-k\tkeep existing files\n");
+-	error("\t-keep-old-files,-k\tkeep existing files\n");
+-	error("\t-refresh-old-files\trefresh existing files, don't create new files\n");
 -	error("\t-/\t\tdon't strip leading '/'s from file names\n");
 -	error("\tlist=name\tread filenames from named file\n");
 -	error("\t-dodesc\t\tdo descend directories found in a list= file\n");
@ -109,7 +114,8 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 +	fprintf(fp, "\t-not,-V\t\tuse those files which do not match pattern\n");
 +	fprintf(fp, "\tVOLHDR=name\tuse name to generate a volume header\n");
 +	fprintf(fp, "\t-xdir\t\textract dir even if the current is never\n");
-+	fprintf(fp, "\t-keep_old_files,-k\tkeep existing files\n");
+	fprintf(fp, "\t-keep-old-files,-k\tkeep existing files\n");
+	fprintf(fp, "\t-refresh-old-files\trefresh existing files, don't create new files\n");
 +	fprintf(fp, "\t-/\t\tdon't strip leading '/'s from file names\n");
 +	fprintf(fp, "\tlist=name\tread filenames from named file\n");
 +	fprintf(fp, "\t-dodesc\t\tdo descend directories found in a list= file\n");
@ -138,44 +144,50 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 						TSIZE(QIC_250_TSIZE)/1024);
 -	error("\t-nowarn\t\tdo not print warning messages\n");
 -	error("\t-time\t\tprint timing info\n");
-	error("\t-no_statistics\tdo not print statistics\n");
+-	error("\t-no-statistics\tdo not print statistics\n");
 +	fprintf(fp, "\t-nowarn\t\tdo not print warning messages\n");
 +	fprintf(fp, "\t-time\t\tprint timing info\n");
-+	fprintf(fp, "\t-no_statistics\tdo not print statistics\n");
+	fprintf(fp, "\t-no-statistics\tdo not print statistics\n");
 #ifdef	FIFO
 -	error("\t-fifostats\tprint fifo statistics\n");
 +	fprintf(fp, "\t-fifostats\tprint fifo statistics\n");
 #endif
 -	error("\t-numeric\tdon't use user/group name from tape\n");
 -	error("\t-newest\t\tfind newest file on tape\n");
-	error("\t-newest_file\tfind newest regular file on tape\n");
-	error("\t-signed_checksum\tuse signed chars to calculate checksum\n");
+-	error("\t-newest-file\tfind newest regular file on tape\n");
+-	error("\t-hpdev\t\tuse HP's non POSIX compliant method to store dev numbers\n");
+-	error("\t-modebits\tinclude all 16 bits from stat.st_mode, this violates POSIX-1003.1\n");
+-	error("\t-copylinks\tCopy hard and symlinks rather than linking\n");
+-	error("\t-signed-checksum\tuse signed chars to calculate checksum\n");
 -	error("\t-sparse\t\thandle file with holes effectively on store/create\n");
-	error("\t-force_hole\ttry to extract all files with holes\n");
-	error("\t-to_stdout\textract files to stdout\n");
+-	error("\t-force-hole\ttry to extract all files with holes\n");
+-	error("\t-to-stdout\textract files to stdout\n");
 -	error("\t-wready\t\twait for tape drive to become ready\n");
-	error("\t-force_remove\tforce to remove non writable files on extraction\n");
-	error("\t-ask_remove\task to remove non writable files on extraction\n");
-	error("\t-remove_first\tremove files before extraction\n");
-	error("\t-remove_recursive\tremove files recursive\n");
-	error("\t-nullout\tsimulate creating an achive to compute the size\n");
+-	error("\t-force-remove\tforce to remove non writable files on extraction\n");
+-	error("\t-ask-remove\task to remove non writable files on extraction\n");
+-	error("\t-remove-first\tremove files before extraction\n");
+-	error("\t-remove-recursive\tremove files recursive\n");
+-	error("\t-onull,-nullout\tsimulate creating an achive to compute the size\n");
 +	fprintf(fp, "\t-numeric\tdon't use user/group name from tape\n");
 +	fprintf(fp, "\t-newest\t\tfind newest file on tape\n");
-+	fprintf(fp, "\t-newest_file\tfind newest regular file on tape\n");
-+	fprintf(fp, "\t-signed_checksum\tuse signed chars to calculate checksum\n");
+	fprintf(fp, "\t-newest-file\tfind newest regular file on tape\n");
+	fprintf(fp, "\t-hpdev\t\tuse HP's non POSIX compliant method to store dev numbers\n");
+	fprintf(fp, "\t-modebits\tinclude all 16 bits from stat.st_mode, this violates POSIX-1003.1\n");
+	fprintf(fp, "\t-copylinks\tCopy hard and symlinks rather than linking\n");
+	fprintf(fp, "\t-signed-checksum\tuse signed chars to calculate checksum\n");
 +	fprintf(fp, "\t-sparse\t\thandle file with holes effectively on store/create\n");
-+	fprintf(fp, "\t-force_hole\ttry to extract all files with holes\n");
-+	fprintf(fp, "\t-to_stdout\textract files to stdout\n");
+	fprintf(fp, "\t-force-hole\ttry to extract all files with holes\n");
+	fprintf(fp, "\t-to-stdout\textract files to stdout\n");
 +	fprintf(fp, "\t-wready\t\twait for tape drive to become ready\n");
-+	fprintf(fp, "\t-force_remove\tforce to remove non writable files on extraction\n");
-+	fprintf(fp, "\t-ask_remove\task to remove non writable files on extraction\n");
-+	fprintf(fp, "\t-remove_first\tremove files before extraction\n");
-+	fprintf(fp, "\t-remove_recursive\tremove files recursive\n");
-+	fprintf(fp, "\t-nullout\tsimulate creating an achive to compute the size\n");
+	fprintf(fp, "\t-force-remove\tforce to remove non writable files on extraction\n");
+	fprintf(fp, "\t-ask-remove\task to remove non writable files on extraction\n");
+	fprintf(fp, "\t-remove-first\tremove files before extraction\n");
+	fprintf(fp, "\t-remove-recursive\tremove files recursive\n");
+	fprintf(fp, "\t-onull,-nullout\tsimulate creating an achive to compute the size\n");
 	exit(ret);
 	/* NOTREACHED */
 }
-@@ -503,27 +507,29 @@ LOCAL void
+@@ -548,27 +552,29 @@ LOCAL void
 dusage(ret)
 	int	ret;
 {
@ -226,7 +238,7 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 	exit(ret);
 	/* NOTREACHED */
 }
-@@ -532,12 +538,14 @@ LOCAL void
+@@ -577,13 +583,15 @@ LOCAL void
 husage(ret)
 	int	ret;
 {
@ -236,6 +248,7 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 -	error("\tgnutar\t\tgnu tar format\n");
 -	error("\tustar\t\tstandard tar (ieee 1003.1) format\n");
 -	error("\txstar\t\textended standard tar format\n");
+-	error("\txustar\t\textended standard tar format without tar signature\n");
 +	FILE *fp = ret ? stderr : stdout;
 +
 +	fprintf(fp, "Header types:\n");
@ -244,6 +257,7 @@ $OpenBSD: patch-star_star_c,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
 +	fprintf(fp, "\tgnutar\t\tgnu tar format\n");
 +	fprintf(fp, "\tustar\t\tstandard tar (ieee 1003.1) format\n");
 +	fprintf(fp, "\txstar\t\textended standard tar format\n");
+	fprintf(fp, "\txustar\t\textended standard tar format without tar signature\n");
 	exit(ret);
 	/* NOTREACHED */
 }
--- a/archivers/star/pkg/DEINSTALL
+++ b/archivers/star/pkg/DEINSTALL
@ -0,0 +1,66 @@
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.1 2001/05/06 21:52:46 naddy Exp $
+#
+# star de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${SYSCONFDIR}/srmt.conf
+
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| these steps as root:"
+    echo "|"
+    echo "|       rm -f ${CONFIG_FILE}"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+}
+
+do_unlink()
+{
+    if [ X`readlink /etc/rmt` = X${PREFIX}/libexec/srmt ]; then
+	rm -f /etc/rmt
+	echo
+	echo "+---------------"
+	echo "| You should reset the /etc/rmt link to whatever it was
+	echo "| before star was installed, perhaps /usr/sbin/rmt
+	echo "| Try these steps as root:"
+	echo "|"
+	echo "|           cd /etc"
+	echo "|           ln -s /usr/sbin/rmt ."
+	echo "|"
+	echo "+---------------"
+	echo
+    fi
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname DEINSTALL" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    DEINSTALL)
+	if [ -f ${CONFIG_FILE} ]; then
+	    do_notice "$1"
+	fi
+	do_unlink "$1"
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- a/archivers/star/pkg/DESCR
+++ b/archivers/star/pkg/DESCR
@ -15,6 +15,3 @@ Main advantages over other tar implementations:
    automatic format detect	- Automatically detects archive formats:
 				  old tar, GNU tar, ANSI tar, star.
    fully ansi compatible	- star is fully ANSI/POSIX 1003.1 compatible.
-
-Author: Joerg Schilling <schilling@fokus.gmd.de>
-Please mail bugs and suggestions to him.
--- a/archivers/star/pkg/INSTALL
+++ b/archivers/star/pkg/INSTALL
@ -0,0 +1,54 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2001/05/06 21:52:46 naddy Exp $
+#
+# Pre/post-installation setup of star
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+
+# Function: tell the user what s/he needs to do to use the port just installed
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| You might want to setup a link to /etc/rmt by issuing the command:"
+    echo "|"
+    echo "|        ln -sf ${PREFIX}/libexec/srmt /etc/rmt"
+    echo "|"
+    echo "| If so, you should try to remember to reset that link"
+    echo "| to its former value if you ever pkg_delete this package."
+    echo "| It is NOT necessary to do this to use star."
+    echo "|"
+    echo "| If you use srmt, you want to set up ${SYSCONFDIR}/srmt.conf,"
+    echo "| cf. $PREFIX/share/examples/star/srmt.conf.sample."
+    echo "+---------------"
+    echo
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	do_notice $1
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- a/archivers/star/pkg/PLIST
+++ b/archivers/star/pkg/PLIST
@ -1,5 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2000/10/01 21:15:49 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2001/05/06 21:52:46 naddy Exp $
 bin/star
 bin/ustar
+libexec/srmt
 man/man1/star.1
 man/man1/ustar.1
+man/man8/srmt.8
+share/examples/star/srmt.conf.sample
+@dirrm share/examples/star