svn commit: r374784 - head/net/istgt

[Alexey Dokuchaev]

Author: danfe
Date: Tue Dec 16 05:02:37 2014
New Revision: 374784
URL: https://svnweb.freebsd.org/changeset/ports/374784
QAT: https://qat.redports.org/buildarchive/r374784/

Log:
  - Improve VBOXVD_DESC, define LICENSE, remove redundant PKGMESSAGE
  - Simplify post-install recipe, generally cleanup Makefile while here
  - Convert PLIST_* knobs into pkg-plist (8 lines make it long enough
    to be kept in a separate file), use sample@ keyword

Added:
  head/net/istgt/pkg-plist   (contents, props changed)
     - copied, changed from r269500, head/net/istgt/pkg-plist
Modified:
  head/net/istgt/Makefile

Modified: head/net/istgt/Makefile
==============================================================================
--- head/net/istgt/Makefile	Tue Dec 16 02:58:47 2014	(r374783)
+++ head/net/istgt/Makefile	Tue Dec 16 05:02:37 2014	(r374784)
@@ -3,35 +3,26 @@
 
 PORTNAME=	istgt
 PORTVERSION=	20121028
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.peach.ne.jp/archives/istgt/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	iSCSI target for openSUSE/Debian/NetBSD/FreeBSD
 
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+LICENSE=	BSD2CLAUSE
 
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/istgt \
-		bin/istgtcontrol \
-		etc/rc.d/istgt \
-		%%ETCDIR%%/auth.conf.sample \
-		%%ETCDIR%%/istgt.conf.sample \
-		%%ETCDIR%%/istgt.large.conf.sample \
-		%%ETCDIR%%/istgtcontrol.conf.sample \
-		man/man1/istgt.1.gz
-PLIST_DIRSTRY=	%%ETCDIR%%
-PORTDOCS=	${DOCS:T}
+PORTDOCS=	${DOCFILES:T}
+DOCFILES=	ChangeLog.jp README doc/QUICKSTART doc/QUICKSTART.jp
 
-DOCS=		ChangeLog.jp README doc/QUICKSTART doc/QUICKSTART.jp
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	SYMLNKDEV VBOXVD
-OPTIONS_DEFAULT=
+
 SYMLNKDEV_DESC=	Allow symbolic link for device file
-VBOXVD_DESC=	Build with VBox VD support(no X11 required)
+VBOXVD_DESC=	Build with VBox VD support (no X11 required)
 
 .include <bsd.port.options.mk>
 
@@ -50,7 +41,7 @@ post-extract:
 	@${REINPLACE_CMD} -e '/\/doc\/istgt/d' ${WRKSRC}/doc/Makefile.in
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Copied and modified: head/net/istgt/pkg-plist (from r269500, head/net/istgt/pkg-plist)
==============================================================================
--- head/net/istgt/pkg-plist	Tue Feb 22 13:22:14 2011	(r269500, copy source)
+++ head/net/istgt/pkg-plist	Tue Dec 16 05:02:37 2014	(r374784)
@@ -1,9 +1,8 @@
- at comment $FreeBSD$
 bin/istgt
 bin/istgtcontrol
 etc/rc.d/istgt
-etc/istgt/istgt.conf.sample
-etc/istgt/istgt.large.conf.sample
-etc/istgt/auth.conf.sample
-etc/istgt/istgtcontrol.conf.sample
- at dirrm etc/istgt
+ at sample %%ETCDIR%%/auth.conf.sample
+ at sample %%ETCDIR%%/istgt.conf.sample
+ at sample %%ETCDIR%%/istgt.large.conf.sample
+ at sample %%ETCDIR%%/istgtcontrol.conf.sample
+man/man1/istgt.1.gz