4 files changed, 54 insertions, 50 deletions

diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 39b298cfc4df..dfbada203134 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=		star
-PORTVERSION=		1.2
-CATEGORIES=		sysutils
+PORTVERSION=		1.3
+CATEGORIES=		sysutils archivers
 MASTER_SITES=		ftp://ftp.fokus.gmd.de/pub/unix/star/ \
 			${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/compress
@@ -27,7 +27,8 @@ post-extract:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/star/OBJ/${MACHINE_ARCH}-freebsd-cc/star \
+	${INSTALL_PROGRAM} \
+		${WRKSRC}/star/OBJ/${MACHINE_ARCH}-freebsd-${CC}/star \
 		${PREFIX}/bin
 	cd ${PREFIX}/bin ; ${LN} -f star ustar
 	${INSTALL_MAN} ${WRKSRC}/star/star.1 ${PREFIX}/man/man1
diff --git a/archivers/star/distinfo b/archivers/star/distinfo
index 90b0c216da4a..e5640ae788c4 100644
--- a/archivers/star/distinfo
+++ b/archivers/star/distinfo
@@ -1 +1 @@
-MD5 (star-1.2.tar.gz) = a49261837f2aa99355db3fae57d617ac
+MD5 (star-1.3.tar.gz) = 692625a76ba5e52bd62312ebb6eff7ac
diff --git a/archivers/star/files/patch-ab b/archivers/star/files/patch-ab
index 1bb6a51328ed..0cdbbab9ece4 100644
--- a/archivers/star/files/patch-ab
+++ b/archivers/star/files/patch-ab
@@ -1,6 +1,6 @@
---- star/star.c.orig	Thu May  6 17:09:19 1999
-+++ star/star.c	Thu May  6 17:14:00 1999
-@@ -403,44 +403,46 @@
+--- 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;
  {
@@ -10,7 +10,7 @@
 -	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");
@@ -23,15 +23,15 @@
 +	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
@@ -41,6 +41,7 @@
 -	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");
@@ -52,16 +53,18 @@
 -	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");
@@ -73,15 +76,16 @@
 +	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 @@
+@@ -490,56 +492,58 @@ LOCAL void
  xusage(ret)
  	int	ret;
  {
@@ -91,7 +95,8 @@
 -	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");
@@ -108,7 +113,8 @@
 +	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");
@@ -137,44 +143,50 @@
  						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 @@
+@@ -548,27 +552,29 @@ LOCAL void
  dusage(ret)
  	int	ret;
  {
@@ -225,7 +237,7 @@
  	exit(ret);
  	/* NOTREACHED */
  }
-@@ -532,12 +538,14 @@
+@@ -577,13 +583,15 @@ LOCAL void
  husage(ret)
  	int	ret;
  {
@@ -235,6 +247,7 @@
 -	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");
@@ -243,6 +256,7 @@
 +	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 */
  }
diff --git a/archivers/star/files/patch-ac b/archivers/star/files/patch-ac
index 8d4d7feffcbb..e69de29bb2d1 100644
--- a/archivers/star/files/patch-ac
+++ b/archivers/star/files/patch-ac
@@ -1,11 +0,0 @@
---- include/standard.h.orig	Sun May 30 23:20:26 1999
-+++ include/standard.h	Sun May 30 23:21:25 1999
-@@ -182,7 +182,7 @@
- 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 *));