star: update to 1.5.4nb1.

Packaged for wip by Michael Bäuerle.

Changes: too many to list, last distfile was from 2003.

13 files changed, 137 insertions, 302 deletions

diff --git a/archivers/star/DESCR b/archivers/star/DESCR
index 958cb6a6ffc..56094cc106a 100644
--- a/archivers/star/DESCR
+++ b/archivers/star/DESCR
@@ -1,11 +1,3 @@
-Star is a full-featured tar command that can access local and remote
-tar archives (files and tapes). It reads and writes POSIX compliant
-tar archives as well as non-POSIX GNU tar archives.
-Star is the first POSIX.1-2001 compliant tar implementation. It includes
-a FIFO for speed, a pattern matcher, multi-volume support, the ability to
-archive sparse files and ACLs and the ability to archive extended file flags.
-It supports automatic archive format detection, automatic byte order
-recognition, automatic archivecompression/decompression. It includes the
-only known platform independent "rmt" server program that implements all
-Sun/GNU/Schily/BSD enhancements and allows any "rmt" client from any OS to
-contact any OS as server.
+The Schily tape archiver
+
+Unique standard tape archiver (the oldest free TAR implementation).
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 3a97265889f..e2081006a21 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,46 +1,81 @@
-# $NetBSD: Makefile,v 1.37 2016/12/11 03:58:36 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.38 2018/11/10 19:55:54 wiz Exp $
 
-DISTNAME=	star-1.4.3
-PKGREVISION=	4
+DISTNAME=	schily-2018-10-30
+PKGNAME=	star-1.5.4
+PKGREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://downloads.sourceforge.net/project/s-tar/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	uebayasi@NetBSD.org
-HOMEPAGE=	http://cdrecord.berlios.de/old/private/star.html
-HOMEPAGE=	http://freecode.com/projects/star
-COMMENT=	The fastest tar like archiver for UNIX
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://s-tar.sf.net/
+COMMENT=	Unique standard tape archiver
+LICENSE=	cddl-1.0
 
-USE_TOOLS+=	gmake
-MAKE_FLAGS+=	INS_BASE=${DESTDIR}${PREFIX}
-MAKE_FLAGS+=	RUNPATH=
-MAKE_FLAGS+=	MANDIR=${PKGMANDIR}
+MAKE_JOBS_SAFE=	no
+
+USE_TOOLS+=	tbl
+TOOL_DEPENDS+=	smake-[0-9]*:../../devel/smake
+SMAKE=		MAKEFLAGS= smake
+MAKE_FLAGS+=	DESTDIR=${DESTDIR} INS_BASE=${PREFIX} DEFMANBASE=. MANDIR=${PKGMANDIR}
+# Honor CPPFLAGS, CFLAGS and LDFLAGS
+MAKE_FLAGS+=	CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(CC:M*gcc*)
-MAKE_ENV+=	CCOM=gcc
+# The default location is /etc/default/star
+# We patch the documentation appropriately. Additionally, we also provide a
+# MESSAGE stating the reasons we do this, as required by the license.
+STAR_CONF?=	${PKG_SYSCONFDIR}/star
+
+.if ${STAR_CONF} != "/etc/default/star"
+MESSAGE_SRC+=	MESSAGE.star
+MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV}
+MESSAGE_SUBST+=	STAR_CONF=${STAR_CONF:Q}
 .endif
 
-# without this installing ploughs on case-insensitive fses
-post-extract:
-	cd ${WRKSRC} && mv INSTALL INSTALL.txt
-
-pre-build:
-	set -e; \
-	cd ${WRKSRC}/RULES && for i in arm mipsel x86_64 sparc64 powerpc; do \
-		${LN} -s i386-netbsd-gcc.rul "$$i"-netbsd-gcc.rul;	\
-		${LN} -s i386-netbsd-cc.rul "$$i"-netbsd-cc.rul; done
-	cd ${WRKSRC}/RULES && \
-		${LN} -s i586-linux-gcc.rul x86_64-linux-gcc.rul;	\
-		${LN} -s i586-linux-cc.rul x86_64-linux-cc.rul;	\
-		${LN} -s os-freebsd.id os-dragonfly.id;		\
-		${LN} -s i386-freebsd-gcc.rul x86_64-freebsd-gcc.rul;	\
-		${LN} -s i386-freebsd-cc.rul x86_64-freebsd-cc.rul;	\
-		${LN} -s i386-freebsd-gcc.rul amd64-freebsd-gcc.rul;	\
-		${LN} -s i386-freebsd-cc.rul amd64-freebsd-cc.rul;	\
-		${LN} -s x86_64-netbsd-cc.rul amd64-openbsd-cc.rul;	\
-		${LN} -s sun4-sunos5-cc.rul sun4v-sunos5-cc.rul;	\
-		${LN} -s sun4-sunos5-gcc.rul sun4v-sunos5-gcc.rul
+CONF_FILES=	${PREFIX}/share/examples/star/star ${STAR_CONF}
+AUTO_MKDIRS=	yes
+
+SUBST_CLASSES+=		fix
+SUBST_STAGE.fix=	pre-configure
+SUBST_FILES.fix+=	star/star.1
+SUBST_FILES.fix+=	star/star.dfl
+SUBST_FILES.fix+=	star/defaults.c
+SUBST_SED.fix=		-e "s,/etc/default/star,${STAR_CONF},g"
+SUBST_MESSAGE.fix=	Replace defaults file paths.
+
+# Shared platform specific code for schilytools (provided by smake package)
+.include "../../devel/smake/Makefile.common"
+
+do-configure:
+	cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
+
+do-build:
+	cd ${WRKSRC} && for library in					\
+		libschily libdeflt libfind librmt;			\
+	do								\
+		cd ${WRKSRC}/$${library} && ${SMAKE} ${MAKE_FLAGS};	\
+	done
+	cd ${WRKSRC}/star && ${SMAKE} ${MAKE_FLAGS}
+
+# Process tables in manpage
+post-build:
+	cd ${WRKSRC} && if ${TEST} -f star/pkgsrc_tbl.done; then :;	\
+	else								\
+		${TBL} star/spax.1 >star/spax.1.tmp &&			\
+		${MV} -f star/spax.1.tmp star/spax.1 &&			\
+		${TBL} star/star.4 >star/star.4.tmp &&			\
+		${MV} -f star/star.4.tmp star/star.4 &&			\
+		${TOUCH} star/pkgsrc_tbl.done;				\
+	fi
+
+do-test:
+	cd ${WRKSRC}/star && cd tests ; ${SMAKE} ${MAKE_FLAGS} tests
+
+do-install:
+	cd ${WRKSRC}/star && ${SMAKE} ${MAKE_FLAGS} install
+	${INSTALL_DATA} ${WRKSRC}/star/star.dfl				\
+		${DESTDIR}${PREFIX}/share/examples/star/star
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/star/PLIST b/archivers/star/PLIST
index f3611f28850..c42b83a0f8c 100644
--- a/archivers/star/PLIST
+++ b/archivers/star/PLIST
@@ -1,32 +1,62 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/16 23:21:06 grant Exp $
-bin/mt
-bin/smt
+@comment $NetBSD: PLIST,v 1.3 2018/11/10 19:55:54 wiz Exp $
+bin/gnutar
+bin/scpio
+bin/spax
 bin/star
-bin/tartest
+bin/suntar
+bin/tar
 bin/ustar
-include/align.h
-include/avoffset.h
-lib/libdeflt.a
-lib/librmt.a
-lib/libschily.a
-man/man1/rmt.1
+man/man1/gnutar.1
+man/man1/scpio.1
+man/man1/spax.1
 man/man1/star.1
-man/man1/tartest.1
-man/man3/mtg2rmtg.3
-man/man3/rmtclose.3
-man/man3/rmtdebug.3
-man/man3/rmtfilename.3
-man/man3/rmtg2mtg.3
-man/man3/rmtgetconn.3
-man/man3/rmthostname.3
-man/man3/rmtinit.3
-man/man3/rmtioctl.3
-man/man3/rmtopen.3
-man/man3/rmtread.3
-man/man3/rmtseek.3
-man/man3/rmtstatus.3
-man/man3/rmtwrite.3
-man/man3/rmtxstatus.3
-man/man5/makefiles.5
-man/man5/makerules.5
-sbin/rmt
+man/man1/suntar.1
+man/man1/ustar.1
+man/man5/star.5
+share/doc/star/README
+share/doc/star/README.ACL
+share/doc/star/README.crash
+share/doc/star/README.largefiles
+share/doc/star/README.mtio
+share/doc/star/README.otherbugs
+share/doc/star/README.pattern
+share/doc/star/README.posix-2001
+share/doc/star/STARvsGNUTAR
+share/doc/star/testscripts/00INDEX
+share/doc/star/testscripts/100char_longlink.tar
+share/doc/star/testscripts/100char_longlink.tar-non-compliant
+share/doc/star/testscripts/README.GNUtar-multivol.fail
+share/doc/star/testscripts/README.create-and-remove
+share/doc/star/testscripts/README.gtarfail
+share/doc/star/testscripts/README.largefiles
+share/doc/star/testscripts/README.longnames
+share/doc/star/testscripts/README.paxbug
+share/doc/star/testscripts/README.quicktest
+share/doc/star/testscripts/create-and-remove.tar
+share/doc/star/testscripts/dirloop.tar
+share/doc/star/testscripts/g-hdr.pax.gz
+share/doc/star/testscripts/gnu-multi-fail-volume1.gtar
+share/doc/star/testscripts/gnu-multi-fail-volume2.gtar
+share/doc/star/testscripts/gtarfail.tar
+share/doc/star/testscripts/gtarfail2.tar
+share/doc/star/testscripts/long.ustar.gz
+share/doc/star/testscripts/mk
+share/doc/star/testscripts/mk2
+share/doc/star/testscripts/not_a_tar_file
+share/doc/star/testscripts/not_a_tar_file2
+share/doc/star/testscripts/old-file.tar
+share/doc/star/testscripts/pax-big-10g.tar.bz2
+share/doc/star/testscripts/quicktest.filelist
+share/doc/star/testscripts/remove.tar
+share/doc/star/testscripts/tartest-quicktest.out
+share/doc/star/testscripts/types-star-oldsparse.tar.gz
+share/doc/star/testscripts/typescript
+share/doc/star/testscripts/ustar-all-filetypes.tar
+share/doc/star/testscripts/ustar-all-quicktest-past-contig.tar
+share/doc/star/testscripts/ustar-all-quicktest.tar
+share/doc/star/testscripts/ustar-all-quicktest.tar-without-cont-file
+share/doc/star/testscripts/ustar-bad-filetypes.tar
+share/doc/star/testscripts/ustar-bad-signedsum.tar
+share/doc/star/testscripts/ustar-big-2g.tar.bz2
+share/doc/star/testscripts/ustar-big-8g.tar.bz2
+share/examples/star/star
diff --git a/archivers/star/distinfo b/archivers/star/distinfo
index 6a028b730e9..016241e9325 100644
--- a/archivers/star/distinfo
+++ b/archivers/star/distinfo
@@ -1,15 +1,6 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 00:56:26 agc Exp $
+$NetBSD: distinfo,v 1.14 2018/11/10 19:55:54 wiz Exp $
 
-SHA1 (star-1.4.3.tar.gz) = c59b68d97edba77a9ac6000be04d457ded1eefe9
-RMD160 (star-1.4.3.tar.gz) = f7ec71bfab1723c994e5eed7e6818394a41d44d9
-SHA512 (star-1.4.3.tar.gz) = 984001fe5c32775706d1e36220e1bccd2ffc4d87a969df05b5953b55192b2dc7ac663449c09688b87c13d6e57e1a230f79dc0aedecfe9e0f7e9ddbbb70f6ee0d
-Size (star-1.4.3.tar.gz) = 520388 bytes
-SHA1 (patch-aa) = 4fe4af396adf23eb7ac071b02a7bf726ab1e4318
-SHA1 (patch-ab) = aea3af88d3bedf2ce7a7744c90062ba4e57bb79f
-SHA1 (patch-ac) = 81e6361db3903e5b04fae4e70ad3a37f9a2f4fa7
-SHA1 (patch-ad) = 2be98feac17350b37c242a6f84f539e81330ee14
-SHA1 (patch-ae) = 9f08ee4a8f1f150d08d8c4688e0c5061ad2db52e
-SHA1 (patch-af) = b28ca20dd8cd5326a9d9836880f09740abca7525
-SHA1 (patch-lib_fexec.c) = 5a40df04d84c0e44037cdcc723325cce741e2e0f
-SHA1 (patch-star_fflags.c) = 66fb755de21734eed5c18c896c7aa2ed13696d99
-SHA1 (patch-star_star__unix.c) = 3c478f3cd166f8ee03477a3cb00ef8609be53f4b
+SHA1 (schily-2018-10-30.tar.bz2) = 2c70cd99d732c70193577d61793c32399fcc7378
+RMD160 (schily-2018-10-30.tar.bz2) = f5a843cde89f3e5d54b1925da288fab97990d3eb
+SHA512 (schily-2018-10-30.tar.bz2) = 72765d11eff52f744a707605a53365da69037c3d982c7b8f4cee98f109f856ee28af3420f63c3fe5a7890649c4eb0fa4dd69d367b7ec41026f288d6237c98d96
+Size (schily-2018-10-30.tar.bz2) = 4311065 bytes
diff --git a/archivers/star/patches/patch-aa b/archivers/star/patches/patch-aa
deleted file mode 100644
index 29cefc75625..00000000000
--- a/archivers/star/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/09/25 06:35:49 cjep Exp $
-
---- RULES/mk-gmake.id.orig	Sun Dec  6 12:51:19 1998
-+++ RULES/mk-gmake.id	Tue Sep 24 21:07:24 2002
-@@ -44,8 +44,14 @@
- XK_ARCH:=	$(shell uname -m    | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
- XM_ARCH:=	$(shell $(_ARCHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
- 
-+__OS:=		$(shell uname -s)
-+
- P_ARCH=		$(XP_ARCH)
-+ifeq ($(__OS),NetBSD)
-+K_ARCH=		$(XP_ARCH)
-+else
- K_ARCH=		$(XK_ARCH)
-+endif
- M_ARCH=		$(XM_ARCH)
- 
- _XP_ARCH=	$(XP_ARCH:unknown=$(K_ARCH))
diff --git a/archivers/star/patches/patch-ab b/archivers/star/patches/patch-ab
deleted file mode 100644
index e4807faa90e..00000000000
--- a/archivers/star/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/05/02 22:26:12 danw Exp $
-
---- DEFAULTS/Defaults.darwin.orig	Sun May  2 17:01:01 2004
-+++ DEFAULTS/Defaults.darwin
-@@ -34,5 +34,5 @@ DEFUMASK=	002
- #
- DEFINSMODEF=	444
- DEFINSMODEX=	755
--DEFINSUSR=	bin
--DEFINSGRP=	bin
-+DEFINSUSR=	root
-+DEFINSGRP=	wheel
diff --git a/archivers/star/patches/patch-ac b/archivers/star/patches/patch-ac
deleted file mode 100644
index df6383ba123..00000000000
--- a/archivers/star/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/12/30 17:25:42 cjep Exp $
-
---- RULES/rules.man.orig	1997-02-11 11:49:27.000000000 +0000
-+++ RULES/rules.man
-@@ -20,7 +20,9 @@
- # along with this program; see the file COPYING.  If not, write to
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- ###########################################################################
--include		$(SRCROOT)/$(RULESDIR)/man-$(MANSTYLE).def
-+#include		$(SRCROOT)/$(RULESDIR)/man-$(MANSTYLE).def
-+# Pkgsrc owns everything under PREFIX so use BSD-style man pages
-+include		$(SRCROOT)/$(RULESDIR)/man-bsd.def
- ###########################################################################
- 
- INSDIR=		$(MANDIR)/$(MANSECT)
diff --git a/archivers/star/patches/patch-ad b/archivers/star/patches/patch-ad
deleted file mode 100644
index 6f4ba10cb69..00000000000
--- a/archivers/star/patches/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2010/09/28 17:50:07 tnn Exp $
-
---- star/extract.c.orig	2002-05-02 20:02:41.000000000 +0000
-+++ star/extract.c
-@@ -92,6 +92,7 @@ EXPORT	int	xt_file		__PR((FINFO * info,
- 					int (*)(void *, char *, int),
- 					void *arg, int amt, char* text));
- EXPORT	void	skip_slash	__PR((FINFO * info));
-+LOCAL	BOOL	has_dotdot	__PR((char *name));
- 
- EXPORT void
- extract(vhname)
-@@ -152,6 +153,12 @@ extract(vhname)
- 		if (is_symlink(&finfo) && same_symlink(&finfo)) {
- 			continue;
- 		}
-+		if (!interactive && has_dotdot(finfo.f_name)) {
-+			errmsgno(EX_BAD, "'%s' contains '..', skipping ...\n",
-+				finfo.f_name);
-+			void_file(&finfo);
-+			return;
-+		}
- 		if (interactive && !ia_change(ptb, &finfo)) {
- 			if (!nflag)
- 				fprintf(vpr, "Skipping ...\n");
-@@ -169,6 +176,12 @@ extract(vhname)
- 			if (!make_dir(&finfo))
- 				continue;
- 		} else if (is_link(&finfo)) {
-+			if (!interactive && has_dotdot(finfo.f_lname)) {
-+				errmsgno(EX_BAD, "'%s' contains '..', "
-+					"skipping ...\n", finfo.f_lname);
-+				void_file(&finfo);
-+				return;
-+			}
- 			if (!make_link(&finfo))
- 				continue;
- 		} else if (is_symlink(&finfo)) {
-@@ -830,3 +843,25 @@ skip_slash(info)
- 	while (info->f_lname[0] == '/')
- 		info->f_lname++;
- }
-+
-+LOCAL BOOL
-+has_dotdot(name)
-+	char	*name;
-+{
-+	register char	*p = name;
-+
-+	while (*p) {
-+		if ((p[0] == '.' && p[1] == '.') &&
-+		    (p[2] == '/' || p[2] == '\0')) {
-+			return (TRUE);
-+		}
-+		do {
-+			if (*p++ == '\0')
-+				return (FALSE);
-+		} while (*p != '/');
-+		p++;
-+		while (*p && *p == '/')	/* Skip multiple slashes */
-+			p++;
-+	}
-+	return (FALSE);
-+}
diff --git a/archivers/star/patches/patch-ae b/archivers/star/patches/patch-ae
deleted file mode 100644
index df55a24690f..00000000000
--- a/archivers/star/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2012/01/30 03:43:58 sbd Exp $
-
-Remove unused custom function "getline" which conflicts with getline(3)
-which is part of the POSIX standard.
-
-Rename custom function "fexecve", which conflicts with glibc's fexecve(3),
-to schily_fexecve.
-
---- include/schily.h.orig	2002-12-24 18:28:01.000000000 +0000
-+++ include/schily.h
-@@ -107,7 +107,7 @@ extern	int	fexecle __PR((const char *, F
- 		/* 6th arg not const, fexecv forces av[ac] = NULL */
- extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
- 							char **));
--extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
-+extern	int	schily_fexecve __PR((const char *, FILE *, FILE *, FILE *,
- 					char * const *, char * const *));
- extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
- extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
-@@ -183,7 +183,6 @@ extern	char	*fillbytes __PR((void *, int
- extern	char	*findbytes __PR((const void *, int, char));
- extern	int	findline __PR((const char *, char, const char *,
- 							int, char **, int));
--extern	int	getline __PR((char *, int));
- extern	int	getstr __PR((char *, int));
- extern	int	breakline __PR((char *, char, char **, int));
- extern	int	getallargs __PR((int *, char * const**, const char *, ...));
diff --git a/archivers/star/patches/patch-af b/archivers/star/patches/patch-af
deleted file mode 100644
index f2467424791..00000000000
--- a/archivers/star/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/01/15 17:46:01 tron Exp $
-
-Remove unused custom function "getline" which conflicts with getline(3)
-which is part of the POSIX standard.
-
---- lib/stdio/fgetline.c.orig	2000-12-03 11:19:29.000000000 +0000
-+++ lib/stdio/fgetline.c	2011-01-15 17:42:18.000000000 +0000
-@@ -62,11 +62,3 @@
- 
- 	return (bp - buf);
- }
--
--EXPORT int
--getline(buf, len)
--	char	*buf;
--	int	len;
--{
--	return (fgetline(stdin, buf, len));
--}
diff --git a/archivers/star/patches/patch-lib_fexec.c b/archivers/star/patches/patch-lib_fexec.c
deleted file mode 100644
index 1252c97a70a..00000000000
--- a/archivers/star/patches/patch-lib_fexec.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-lib_fexec.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
-
-Rename custom function "fexecve", which conflicts with glibc's fexecve(3),
-to schily_fexecve.
-
---- lib/fexec.c.orig	2002-06-08 16:45:11.000000000 +0000
-+++ lib/fexec.c
-@@ -161,7 +161,7 @@ int fexecle(name, in, out, err, va_alist
- 	} while (p != NULL);
- 	va_end(args);
- 
--	ret = fexecve(name, in, out, err, av, env);
-+	ret = schily_fexecve(name, in, out, err, av, env);
- 	if (av != xav)
- 		free(av);
- 	return (ret);
-@@ -174,10 +174,10 @@ int fexecv(name, in, out, err, ac, av)
- 	char *av[];
- {
- 	av[ac] = NULL;			/*  force list to be null terminated */
--	return fexecve (name, in, out, err, av, environ);
-+	return schily_fexecve (name, in, out, err, av, environ);
- }
- 
--int fexecve(name, in, out, err, av, env)
-+int schily_fexecve(name, in, out, err, av, env)
- 	const char *name;
- 	FILE *in, *out, *err;
- 	char * const av[], * const env[];
diff --git a/archivers/star/patches/patch-star_fflags.c b/archivers/star/patches/patch-star_fflags.c
deleted file mode 100644
index bb5016f40df..00000000000
--- a/archivers/star/patches/patch-star_fflags.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-star_fflags.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
-
-<linux/fs.h> must be included before <linux/ext2_fs.h>
-
---- star/fflags.c.orig	2002-01-27 22:48:12.000000000 +0000
-+++ star/fflags.c
-@@ -41,6 +41,7 @@ static	char sccsid[] =
- #include "starsubs.h"
- #ifdef	__linux__
- #include <fctldefs.h>
-+#include <linux/fs.h>
- #include <linux/ext2_fs.h>
- #include <sys/ioctl.h>
- #endif
diff --git a/archivers/star/patches/patch-star_star__unix.c b/archivers/star/patches/patch-star_star__unix.c
deleted file mode 100644
index d5447355f46..00000000000
--- a/archivers/star/patches/patch-star_star__unix.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-star_star__unix.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
-
-<linux/fs.h> must be included before <linux/ext2_fs.h>
-
---- star/star_unix.c.orig	2002-08-15 23:22:32.000000000 +0000
-+++ star/star_unix.c
-@@ -44,6 +44,7 @@ static	char sccsid[] =
- #include "xutimes.h"
- #ifdef	__linux__
- #include <fctldefs.h>
-+#include <linux/fs.h>
- #include <linux/ext2_fs.h>
- #include <sys/ioctl.h>
- #endif