From owner-svn-ports-head@freebsd.org Thu Feb 11 16:22:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18C96AA5CCA; Thu, 11 Feb 2016 16:22:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E51C28CA; Thu, 11 Feb 2016 16:22:43 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1BGMgfY028903; Thu, 11 Feb 2016 16:22:42 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1BGMg9r028894; Thu, 11 Feb 2016 16:22:42 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201602111622.u1BGMg9r028894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 11 Feb 2016 16:22:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408689 - in head: . archivers archivers/star archivers/star/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2016 16:22:44 -0000 Author: rene Date: Thu Feb 11 16:22:41 2016 New Revision: 408689 URL: https://svnweb.freebsd.org/changeset/ports/408689 Log: archivers/star: revive port - update MASTER_SITES - modernize (staging, USES, manual pages, @sample) - add license information (CDDL + GPLv2) - regenerate patches (no content changes) - pass maintainer to submitter While here: - add USE_GCC=any to allow build on FreeBSD 10+ PR: 188974 Submitted by: Chris Hutchinson (portmaster@BSDforge.com) Added: head/archivers/star/ - copied from r354149, head/archivers/star/ head/archivers/star/files/patch-star_Makefile - copied, changed from r354149, head/archivers/star/files/patch-star::Makefile head/archivers/star/files/patch-star_star.1 - copied, changed from r354149, head/archivers/star/files/patch-star::star.1 Deleted: head/archivers/star/files/patch-star::Makefile head/archivers/star/files/patch-star::star.1 Modified: head/MOVED head/archivers/Makefile head/archivers/star/Makefile head/archivers/star/files/patch-rmt_Makefile head/archivers/star/files/patch-rmt_Makefile.man head/archivers/star/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Feb 11 15:40:53 2016 (r408688) +++ head/MOVED Thu Feb 11 16:22:41 2016 (r408689) @@ -6073,7 +6073,6 @@ java/linux-sun-jdk16||2014-05-11|Has exp ports-mgmt/pver||2014-05-11|Has expired: does not support pkgng databases/firebird20-client|databases/firebird25-client|2014-05-11|Firebird 2.0 is EOLed databases/firebird20-server|databases/firebird25-server|2014-05-11|Firebird 2.0 is EOLed -archivers/star||2014-05-15|Has expired: Depends on deprecated smake editors/ved||2014-05-15|Has expired: Depends on deprecated smake japanese/chasen||2014-05-15|Has expired: Unmaintained since 2001 www/openx|www/revive-adserver|2014-05-15|Upstream obsolete, forked Modified: head/archivers/Makefile ============================================================================== --- head/archivers/Makefile Thu Feb 11 15:40:53 2016 (r408688) +++ head/archivers/Makefile Thu Feb 11 16:22:41 2016 (r408689) @@ -197,6 +197,7 @@ SUBDIR += snzip SUBDIR += squeeze SUBDIR += squsq + SUBDIR += star SUBDIR += stuffit SUBDIR += szip SUBDIR += tardy Modified: head/archivers/star/Makefile ============================================================================== --- head/archivers/star/Makefile Thu May 15 16:02:17 2014 (r354149) +++ head/archivers/star/Makefile Thu Feb 11 16:22:41 2016 (r408689) @@ -4,29 +4,25 @@ PORTNAME= star DISTVERSION= 1.5.2 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.berlios.de/pub/star/ +MASTER_SITES= http://BSDforge.com/projects/source/srchivers/star/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Unique standard tape archiver with many enhancements -DEPRECATED= Depends on deprecated smake -EXPIRATION_DATE= 2014-05-12 +LICENSE= CDDL GPLv2 +LICENSE_COMB= multi +LICENSE_FILES= ${WRKSRC}/CDDL.Schily.txt BUILD_DEPENDS= smake:${PORTSDIR}/devel/smake -NO_STAGE= yes -USE_BZIP2= yes -USES= gettext iconv - -.if !defined(NO_INSTALL_MANPAGES) -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 +USES= gettext iconv tar:bzip2 +USE_GCC= any + +.if defined(NO_INSTALL_MANPAGES) XMKFLAGS= XMK_FILE="" .endif -MAKEFLAGS+= MANBASE= +MAKEFLAGS+= DEFMANBASE=. MAKE_ENV+= MAKEFLAGS=${MAKEFLAGS} PORTDOCS= README README.crash README.mtio README.pattern STARvsGNUTAR \ @@ -43,33 +39,28 @@ post-patch: @${MV} ${WRKSRC}/rmt/rmt.1 ${WRKSRC}/rmt/srmt.1 do-build: - cd ${WRKSRC} && ${MAKE_ENV} smake - cd ${WRKSRC}/star && ${MAKE_ENV} smake -f Makefile.doc + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} smake + cd ${WRKSRC}/star && ${SETENV} ${MAKE_ENV} smake -f Makefile.doc do-install: - cd ${WRKSRC}/star && ${MAKE_ENV} smake \ - ${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS} - cd ${WRKSRC}/rmt && ${MAKE_ENV} smake \ - ${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS} - cd ${WRKSRC}/tartest && ${MAKE_ENV} smake \ - ${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS} - @${STRIP_CMD} ${PREFIX}/bin/star - @${STRIP_CMD} ${PREFIX}/sbin/srmt - @${STRIP_CMD} ${PREFIX}/bin/tartest - @${INSTALL_DATA} ${WRKSRC}/star/star.dfl ${PREFIX}/etc/star.sample - @if [ ! -f ${PREFIX}/etc/star ]; then \ - ${CP} -p ${PREFIX}/etc/star.sample ${PREFIX}/etc/star; \ - fi - @${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl ${PREFIX}/etc/rmt.sample - @if [ ! -f ${PREFIX}/etc/rmt ]; then \ - ${CP} -p ${PREFIX}/etc/rmt.sample ${PREFIX}/etc/rmt; \ - fi + cd ${WRKSRC}/star && ${SETENV} ${MAKE_ENV} smake \ + ${INSTALL_TARGET} INS_BASE=${STAGEDIR}${PREFIX} ${XMKFLAGS} + cd ${WRKSRC}/rmt && ${SETENV} ${MAKE_ENV} smake \ + ${INSTALL_TARGET} INS_BASE=${STAGEDIR}${PREFIX} ${XMKFLAGS} + cd ${WRKSRC}/tartest && ${SETENV} ${MAKE_ENV} smake \ + ${INSTALL_TARGET} INS_BASE=${STAGEDIR}${PREFIX} ${XMKFLAGS} +# Ugh... cmake doesn't like install-strip + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/star + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/srmt + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tartest + ${INSTALL_DATA} ${WRKSRC}/star/star.dfl ${STAGEDIR}${PREFIX}/etc/star.sample + ${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl ${STAGEDIR}${PREFIX}/etc/rmt.sample post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/star/${FILE} ${DOCSDIR}/${FILE} + (cd ${WRKSRC}/star && ${INSTALL_DATA} ${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}) .endfor .endif Modified: head/archivers/star/files/patch-rmt_Makefile ============================================================================== --- head/archivers/star/files/patch-rmt_Makefile Thu May 15 16:02:17 2014 (r354149) +++ head/archivers/star/files/patch-rmt_Makefile Thu Feb 11 16:22:41 2016 (r408689) @@ -1,9 +1,9 @@ $FreeBSD$ ---- rmt/Makefile.orig +--- rmt/Makefile.orig 2016-02-10 20:47:23 UTC +++ rmt/Makefile -@@ -6,13 +6,13 @@ +@@ -6,13 +6,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### INSDIR= sbin Modified: head/archivers/star/files/patch-rmt_Makefile.man ============================================================================== --- head/archivers/star/files/patch-rmt_Makefile.man Thu May 15 16:02:17 2014 (r354149) +++ head/archivers/star/files/patch-rmt_Makefile.man Thu Feb 11 16:22:41 2016 (r408689) @@ -1,9 +1,9 @@ $FreeBSD$ ---- rmt/Makefile.man.orig +--- rmt/Makefile.man.orig 2016-02-10 20:47:23 UTC +++ rmt/Makefile.man -@@ -8,10 +8,10 @@ +@@ -8,10 +8,10 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### MANDIR= man Copied and modified: head/archivers/star/files/patch-star_Makefile (from r354149, head/archivers/star/files/patch-star::Makefile) ============================================================================== --- head/archivers/star/files/patch-star::Makefile Thu May 15 16:02:17 2014 (r354149, copy source) +++ head/archivers/star/files/patch-star_Makefile Thu Feb 11 16:22:41 2016 (r408689) @@ -1,6 +1,6 @@ ---- 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 @@ +--- star/Makefile.orig 2016-02-10 20:47:23 UTC ++++ star/Makefile +@@ -15,7 +15,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin TARGET= star #SYMLINKS= ustar tar @@ -9,7 +9,7 @@ CPPOPTS += -D__STAR__ CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -@@ -52,8 +52,8 @@ +@@ -52,8 +52,8 @@ LIBS= -ldeflt -lrmt -lfind -lschily $(L # # Wenn -lfind, dann auch $(LIB_INTL) # Copied and modified: head/archivers/star/files/patch-star_star.1 (from r354149, head/archivers/star/files/patch-star::star.1) ============================================================================== --- head/archivers/star/files/patch-star::star.1 Thu May 15 16:02:17 2014 (r354149, copy source) +++ head/archivers/star/files/patch-star_star.1 Thu Feb 11 16:22:41 2016 (r408689) @@ -1,6 +1,6 @@ ---- star/star.1.orig Thu Nov 24 21:05:10 2005 -+++ star/star.1 Thu Nov 24 21:06:26 2005 -@@ -32,14 +32,6 @@ +--- star/star.1.orig 2016-02-10 20:47:23 UTC ++++ star/star.1 +@@ -32,14 +32,6 @@ star \- unique standard tape archiver .I file1 .\|.\|. filen [\fIfind_expr\fP] .br Modified: head/archivers/star/pkg-plist ============================================================================== --- head/archivers/star/pkg-plist Thu May 15 16:02:17 2014 (r354149) +++ head/archivers/star/pkg-plist Thu Feb 11 16:22:41 2016 (r408689) @@ -4,10 +4,13 @@ bin/star bin/suntar bin/tartest bin/ustar +@sample etc/rmt.sample +@sample etc/star.sample +man/man1/scpio.1.gz +man/man1/spax.1.gz +man/man1/srmt.1.gz +man/man1/star.1.gz +man/man1/suntar.1.gz +man/man1/tartest.1.gz +man/man5/star.5.gz sbin/srmt -@unexec if cmp -s %D/etc/rmt %D/etc/rmt.sample; then rm -f %D/etc/rmt; fi -etc/rmt.sample -@exec [ -f %B/rmt ] || cp %B/%f %B/rmt -@unexec if cmp -s %D/etc/star %D/etc/star.sample; then rm -f %D/etc/star; fi -etc/star.sample -@exec [ -f %B/star ] || cp %B/%f %B/star