- Update to 1.5.a.58

- Change maintainer e-mail
- URL and description adjustment
- Required devel/smake

PR:             ports/77939
Submitted by:   maintainer

8 files changed, 52 insertions, 82 deletions

diff --git a/archivers/star-devel/Makefile b/archivers/star-devel/Makefile
index 47a5aae..8876afe 100644
--- a/archivers/star-devel/Makefile
+++ b/archivers/star-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	star
-PORTVERSION=	1.5.a.54
+PORTVERSION=	1.5.a.58
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.berlios.de/pub/star/alpha/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./a/}
@@ -14,28 +14,22 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./a/}
 MAINTAINER=	martin@matuska.org
 COMMENT=	Unique standard tape archiver with many enhancements
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/smake:${PORTSDIR}/devel/smake
+
 CONFLICTS=	star-1.4*
 LATEST_LINK=	star-devel
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.a.*//g}
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	MAKEPROG=${GMAKE} CCOM=${CC} LANG=C
 MAN1=		star.1
 MLINKS=		star.1 ustar.1
+MAKE_ENV=	MAKEFLAGS=${MAKEFLAGS}
 
-post-extract:
-.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
-	@${LN} -sf i386-freebsd-cc.rul \
-		${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
-.endif
+do-build:
+	@cd ${WRKSRC} && ${MAKE_ENV} ${LOCALBASE}/bin/smake
 
 do-install:
-	@${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 ${MANPREFIX}/man/man1
+	@cd ${WRKSRC}/star && ${MAKE_ENV} ${LOCALBASE}/bin/smake install SYMLINKS="star ustar" INS_BASE=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/archivers/star-devel/distinfo b/archivers/star-devel/distinfo
index 55164c4..ef832e7 100644
--- a/archivers/star-devel/distinfo
+++ b/archivers/star-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (star-1.5a54.tar.bz2) = 0cb79b61d04a98b2f29743c6ee6288b7
-SIZE (star-1.5a54.tar.bz2) = 619205
+MD5 (star-1.5a58.tar.bz2) = b3c367f0cda2a41dd055edff674e104c
+SIZE (star-1.5a58.tar.bz2) = 610440
diff --git a/archivers/star-devel/files/patch-RULES::i386-freebsd-cc.rul b/archivers/star-devel/files/patch-RULES::i386-freebsd-cc.rul
deleted file mode 100644
index 60c9db7..0000000
--- a/archivers/star-devel/files/patch-RULES::i386-freebsd-cc.rul
+++ /dev/null
@@ -1,39 +0,0 @@
---- RULES/i386-freebsd-cc.rul.orig	Wed Oct 16 05:43:39 2002
-+++ RULES/i386-freebsd-cc.rul	Tue Nov 26 03:09:44 2002
-@@ -24,7 +24,7 @@
- ###########################################################################
- 
- CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
--CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-+CFLAGS+=	-static $(COPTS) $(CWARNOPTS) $(COPTX)
- 
- CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
- COPTS=
-@@ -47,7 +47,7 @@
- 
- LIBS_PATH=	-L$(OLIBSDIR)
- 
--LDFLAGS=	$(LDOPTS) $(LDOPTX)
-+LDFLAGS+=	-static $(LDOPTS) $(LDOPTX)
- LDLIBS=		$(LIBS) $(LIBX)
- 
- #LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
-@@ -57,14 +57,14 @@
- 
- FLOAT_OPTIONS=	
- 
--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}
- RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
- ARFLAGS=	cr
- LORDER=		lorder
- TSORT=		tsort
- 
- RMDEP=		:
--MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); ${CCOM} -M
- MKDEP_OUT=
diff --git a/archivers/star-devel/files/patch-RULES::rules.cnf b/archivers/star-devel/files/patch-RULES::rules.cnf
deleted file mode 100644
index 07733a7..0000000
--- a/archivers/star-devel/files/patch-RULES::rules.cnf
+++ /dev/null
@@ -1,14 +0,0 @@
---- RULES/rules.cnf.orig	Sun Jul 21 02:26:12 2002
-+++ RULES/rules.cnf	Sun Jul 21 02:27:02 2002
-@@ -33,8 +33,9 @@
- #
- # Hack until the <mach>-<os>-*cc.rul files are updated
- #
--_HCCCOM=	$(OARCH:%-gcc=gcc)
--HCCCOM=		$(_HCCCOM:%-cc=cc)
-+#_HCCCOM=	$(OARCH:%-gcc=gcc)
-+#HCCCOM=	$(_HCCCOM:%-cc=cc)
-+HCCCOM=		$(C_ARCH)
- 
- _CCCOM=		$(_UNIQ)$(CCCOM)
- __CCCOM=	$(_CCCOM:$(_UNIQ)=$(HCCCOM))
diff --git a/archivers/star-devel/files/patch-star::Makefile b/archivers/star-devel/files/patch-star::Makefile
new file mode 100644
index 0000000..fa7eb17
--- /dev/null
+++ b/archivers/star-devel/files/patch-star::Makefile
@@ -0,0 +1,22 @@
+diff -bur star/Makefile star/Makefile
+--- star/Makefile	Fri Feb 25 09:17:45 2005
++++ star/Makefile	Fri Feb 25 09:19:03 2005
+@@ -15,7 +15,7 @@
+ INSDIR=		bin
+ TARGET=		star_fat
+ #SYMLINKS=	ustar tar
+-SYMLINKS=	star ustar tar gnutar suntar scpio spax
++SYMLINKS=	star ustar
+ CPPOPTS +=	-D__STAR__
+ CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
+ #CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP
+@@ -44,8 +44,7 @@
+ #LIBS=		-lunos
+ #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
+ LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
+-XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
+-		spaxman.mk suntarman.mk
++XMK_FILE=	Makefile.man starformatman.mk
+ 
+ star_fat.c: star.c
+ 	$(RM) $(RM_FORCE) $@; cp star.c $@
diff --git a/archivers/star-devel/files/patch-star::star.1 b/archivers/star-devel/files/patch-star::star.1
index 2707690..38199a8 100644
--- a/archivers/star-devel/files/patch-star::star.1
+++ b/archivers/star-devel/files/patch-star::star.1
@@ -1,11 +1,17 @@
---- star/star.1.orig	Thu May  9 23:35:20 2002
-+++ star/star.1	Tue Jun 11 22:49:17 2002
-@@ -15,7 +15,7 @@
- .if n .ds s sz
- .TH STAR 1 "02/05/09" "J\*org Schilling" "Schily\'s USER COMMANDS"
- .SH NAME
--star \- unique standard tape archiver
-+star, ustar \- unique standard tape archiver
- .SH SYNOPSIS
+diff -bur star/star.1 star-1.5/star/star.1
+--- star/star.1	Fri Feb 25 09:07:00 2005
++++ star/star.1	Fri Feb 25 09:07:43 2005
+@@ -31,13 +31,6 @@
+ ] 
+ .I file1 .\|.\|. filen
+ .br
+-.B "tar\ \ "
+-.I command
+-[
+-.I options
+-] 
+-.I file1 .\|.\|. filen
+-.br
  .B "star\ "
- .I command
+ .B "\-copy\ \ "
+ [
diff --git a/archivers/star-devel/pkg-descr b/archivers/star-devel/pkg-descr
index 013ff06..045102d 100644
--- a/archivers/star-devel/pkg-descr
+++ b/archivers/star-devel/pkg-descr
@@ -1,6 +1,6 @@
-star is the fastest known implementation of a tar archiver. star
-development started 1982, development is still in progress. The
-current version is stable.
+Star is the fastest known implementation of a tar archiver.
+
+This is the development version of star.
 
 Main advantages over other tar implementations:
 	fifo			- Keeps the tape streaming.
@@ -16,7 +16,7 @@ Main advantages over other tar implementations:
 				  old tar, gnu tar, ansi tar, star.
 	fully ansi compatible	- star is fully ANSI/Posix 1003.1 compatible.
 
-WWW: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html
+WWW: http://cdrecord.berlios.de/old/private/star.html
 
 Author: Joerg Schilling <js@cs.tu-berlin.de>
 Please mail bugs and suggestions to him.
diff --git a/archivers/star-devel/pkg-plist b/archivers/star-devel/pkg-plist
index 5fd0d4f..21f1393 100644
--- a/archivers/star-devel/pkg-plist
+++ b/archivers/star-devel/pkg-plist
@@ -1,2 +1,3 @@
+bin/star_fat
 bin/star
 bin/ustar