From d20c88cc732c171cd6861472a521720c20b3c6df Mon Sep 17 00:00:00 2001
From: vanilla <vanilla@FreeBSD.org>
Date: Tue, 29 Jan 2013 03:41:30 +0000
Subject: Update to 1.5.2.

PR:		ports/175638
Submitted by:	John Hein <jhein@symmetricom.com>
---
 archivers/star/Makefile                   | 18 +++++++++---------
 archivers/star/distinfo                   |  4 ++--
 archivers/star/files/patch-star::Makefile | 13 +++++++------
 archivers/star/pkg-plist                  |  3 +++
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 3bbef0099a4c..ee9e2ec66bff 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -2,28 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	star
-DISTVERSION=	1.5.1
-PORTREVISION=	1
+DISTVERSION=	1.5.2
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.berlios.de/pub/star/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unique standard tape archiver with many enhancements
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/smake:${PORTSDIR}/devel/smake
+BUILD_DEPENDS=	smake:${PORTSDIR}/devel/smake
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 
 .if !defined(NO_INSTALL_MANPAGES)
-MAN1=		star.1 srmt.1 tartest.1
+MAN1=		scpio.1 spax.1 srmt.1 star.1 suntar.1 tartest.1
 MAN5=		star.5
 MLINKS=		star.1 ustar.1 star.5 ustar.5
 .else
 XMKFLAGS=	XMK_FILE=""
 .endif
 
+MAKEFLAGS+=	MANBASE=
 MAKE_ENV+=	MAKEFLAGS=${MAKEFLAGS}
 
 PORTDOCS=	README README.crash README.mtio README.pattern STARvsGNUTAR \
@@ -38,15 +38,15 @@ post-patch:
 	@${MV} ${WRKSRC}/rmt/rmt.1 ${WRKSRC}/rmt/srmt.1
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${LOCALBASE}/bin/smake
-	@cd ${WRKSRC}/star && ${MAKE_ENV} ${LOCALBASE}/bin/smake -f Makefile.doc
+	cd ${WRKSRC} && ${MAKE_ENV} smake
+	cd ${WRKSRC}/star && ${MAKE_ENV} smake -f Makefile.doc
 
 do-install:
-	@cd ${WRKSRC}/star && ${MAKE_ENV} ${LOCALBASE}/bin/smake \
+	cd ${WRKSRC}/star && ${MAKE_ENV} smake \
 		${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS}
-	@cd ${WRKSRC}/rmt && ${MAKE_ENV} ${LOCALBASE}/bin/smake \
+	cd ${WRKSRC}/rmt && ${MAKE_ENV} smake \
 		${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS}
-	@cd ${WRKSRC}/tartest && ${MAKE_ENV} ${LOCALBASE}/bin/smake \
+	cd ${WRKSRC}/tartest && ${MAKE_ENV} smake \
 		${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS}
 	@${STRIP_CMD} ${PREFIX}/bin/star
 	@${STRIP_CMD} ${PREFIX}/sbin/srmt
diff --git a/archivers/star/distinfo b/archivers/star/distinfo
index 8bb4cf1fa6c0..2eac926dcbb5 100644
--- a/archivers/star/distinfo
+++ b/archivers/star/distinfo
@@ -1,2 +1,2 @@
-SHA256 (star-1.5.1.tar.bz2) = 918cf5d7f2285104990d608dd3e8873a10c60fa56fd21c9b527d6829dea3828e
-SIZE (star-1.5.1.tar.bz2) = 824489
+SHA256 (star-1.5.2.tar.bz2) = 762645b98af13bb9b0512812814ec8e90635d1400c94eb5911e9774daed2addf
+SIZE (star-1.5.2.tar.bz2) = 874558
diff --git a/archivers/star/files/patch-star::Makefile b/archivers/star/files/patch-star::Makefile
index 68f8ae696944..d2addc7aa031 100644
--- a/archivers/star/files/patch-star::Makefile
+++ b/archivers/star/files/patch-star::Makefile
@@ -1,21 +1,22 @@
---- star/Makefile.orig	2008-04-06 20:02:25.000000000 +0200
-+++ star/Makefile	2008-05-16 10:49:50.928160632 +0200
+--- star/Makefile.orig	2010-05-13 13:47:27.000000000 -0600
++++ star/Makefile	2013-01-22 08:50:22.000000000 -0700
 @@ -15,7 +15,7 @@
  INSDIR=		bin
  TARGET=		star
  #SYMLINKS=	ustar tar
 -SYMLINKS=	ustar tar gnutar suntar scpio spax
-+SYMLINKS=	ustar
++SYMLINKS=	ustar suntar scpio spax
  CPPOPTS +=	-D__STAR__
  CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
  #CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP
-@@ -52,8 +52,7 @@
+@@ -52,8 +52,8 @@
  #
  #	Wenn -lfind, dann auch  $(LIB_INTL)
  #
--XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
+-XMK_FILE=	Makefile.man ustarman.mk starformatman.mk scpioman.mk gnutarman.mk \
 -		spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
-+XMK_FILE=	Makefile.man starformatman.mk
++XMK_FILE=	Makefile.man starformatman.mk scpioman.mk \
++		spaxman.mk suntarman.mk
  
  star_fat.c: star.c
  	$(RM) $(RM_FORCE) $@; cp star.c $@
diff --git a/archivers/star/pkg-plist b/archivers/star/pkg-plist
index 5a8eb196fdc5..b05e8702dd70 100644
--- a/archivers/star/pkg-plist
+++ b/archivers/star/pkg-plist
@@ -1,4 +1,7 @@
+bin/scpio
+bin/spax
 bin/star
+bin/suntar
 bin/tartest
 bin/ustar
 sbin/srmt
-- 
cgit