svn commit: r338028 - in head: net-p2p/transmission net-p2p/transmission-cli net-p2p/transmission-cli/files net-p2p/transmission-daemon net-p2p/transmission-gtk net-p2p/transmission-qt4 security/go...

Chris Rees crees at FreeBSD.org
Sun Dec 29 17:08:33 UTC 2013


Author: crees
Date: Sun Dec 29 17:08:28 2013
New Revision: 338028
URL: http://svnweb.freebsd.org/changeset/ports/338028

Log:
  Stage transmission ports and the rest maintained by me.
  
  Various little obvious fixes, and a new rc script for stunnel-server

Modified:
  head/net-p2p/transmission-cli/Makefile
  head/net-p2p/transmission-cli/files/transmission.in
  head/net-p2p/transmission-cli/pkg-plist
  head/net-p2p/transmission-daemon/Makefile
  head/net-p2p/transmission-daemon/pkg-plist
  head/net-p2p/transmission-gtk/Makefile
  head/net-p2p/transmission-gtk/pkg-plist
  head/net-p2p/transmission-qt4/Makefile
  head/net-p2p/transmission-qt4/pkg-plist
  head/net-p2p/transmission/Makefile
  head/security/gorilla/Makefile
  head/sysutils/aird/Makefile
  head/sysutils/reed/Makefile
  head/sysutils/reed/pkg-plist
  head/textproc/atom/Makefile
  head/www/p5-CGI-Enurl/Makefile
  head/www/p5-CGI-Enurl/pkg-plist
  head/www/transmission-web/Makefile
  head/x11-toolkits/skinlf/Makefile

Modified: head/net-p2p/transmission-cli/Makefile
==============================================================================
--- head/net-p2p/transmission-cli/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-cli/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -25,7 +25,6 @@ CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMES
 
 OPTIONS_DEFINE=	LITE
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${SLAVEPORT} != web
@@ -54,8 +53,6 @@ EXTRA_CONF_ARGS?=--enable-cli \
 CONFIGURE_ARGS+=--enable-lightweight
 .endif
 
-MAN1?=		transmission-cli.1 transmission-create.1 transmission-edit.1 \
-		transmission-show.1
 EXTRA_PATCHES=	${PATCHDIR}/disable-web
 .endif
 
@@ -86,12 +83,10 @@ general-patch:
 post-patch: general-patch
 
 general-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 post-install: general-install
 

Modified: head/net-p2p/transmission-cli/files/transmission.in
==============================================================================
--- head/net-p2p/transmission-cli/files/transmission.in	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-cli/files/transmission.in	Sun Dec 29 17:08:28 2013	(r338028)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: transmission
-# REQUIRE: DAEMON 
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable this service:

Modified: head/net-p2p/transmission-cli/pkg-plist
==============================================================================
--- head/net-p2p/transmission-cli/pkg-plist	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-cli/pkg-plist	Sun Dec 29 17:08:28 2013	(r338028)
@@ -2,6 +2,10 @@ bin/transmission-cli
 bin/transmission-create
 bin/transmission-edit
 bin/transmission-show
+man/man1/transmission-cli.1.gz
+man/man1/transmission-create.1.gz
+man/man1/transmission-edit.1.gz
+man/man1/transmission-show.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README

Modified: head/net-p2p/transmission-daemon/Makefile
==============================================================================
--- head/net-p2p/transmission-daemon/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-daemon/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -23,7 +23,7 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--disable-nls
 
-MAN1=		transmission-daemon.1 transmission-remote.1
+post-install:
+		${MKDIR} ${STAGEDIR}${ETCDIR}/home
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/net-p2p/transmission-daemon/pkg-plist
==============================================================================
--- head/net-p2p/transmission-daemon/pkg-plist	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-daemon/pkg-plist	Sun Dec 29 17:08:28 2013	(r338028)
@@ -1,5 +1,7 @@
 bin/transmission-daemon
 bin/transmission-remote
+man/man1/transmission-daemon.1.gz
+man/man1/transmission-remote.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README

Modified: head/net-p2p/transmission-gtk/Makefile
==============================================================================
--- head/net-p2p/transmission-gtk/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-gtk/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -6,8 +6,8 @@ MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Fast and lightweight GTK+2 BitTorrent client
 
 LIB_DEPENDS=	${GEN_LIB_DEPENDS} \
-		notify:${PORTSDIR}/devel/libnotify \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+		libnotify.so:${PORTSDIR}/devel/libnotify \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 RUN_DEPENDS=	${GEN_RUN_DEPENDS} \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
@@ -17,8 +17,8 @@ MASTERDIR=	${.CURDIR}/../transmission-cl
 PLIST=		${.CURDIR}/pkg-plist
 SLAVEPORT=	gtk
 
-USE_GNOME=	gtk30 desktopfileutils intlhack
-USES=		gettext pathfix
+USE_GNOME=	gtk30 intlhack
+USES=		gettext pathfix desktop-file-utils
 INSTALLS_ICONS=	yes
 
 EXTRA_CONF_ARGS=--disable-cli \
@@ -28,14 +28,8 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--enable-nls
 
-MAN1=		transmission-gtk.1
-
 post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|TryExec=.*||g ; /^$$/d' \
 		${WRKSRC}/gtk/transmission-gtk.desktop.in
 
-post-install: general-install
-	@-update-desktop-database
-
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/net-p2p/transmission-gtk/pkg-plist
==============================================================================
--- head/net-p2p/transmission-gtk/pkg-plist	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-gtk/pkg-plist	Sun Dec 29 17:08:28 2013	(r338028)
@@ -1,4 +1,5 @@
 bin/transmission-gtk
+man/man1/transmission-gtk.1.gz
 share/applications/transmission-gtk.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -138,5 +139,3 @@ share/pixmaps/transmission.png
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Modified: head/net-p2p/transmission-qt4/Makefile
==============================================================================
--- head/net-p2p/transmission-qt4/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-qt4/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -16,7 +16,7 @@ SLAVEPORT=	qt4
 
 QT_NONSTANDARD=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build gui dbus network
-USE_GNOME=	desktopfileutils
+USES=		desktop-file-utils
 LDFLAGS+=	-lcrypto
 
 EXTRA_CONF_ARGS=--disable-cli \
@@ -25,13 +25,10 @@ EXTRA_CONF_ARGS=--disable-cli \
 		--disable-mac \
 		--disable-nls
 
-MAN1=		transmission-qt.1
-
 post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \
 		${WRKSRC}/qt/qtr.pro
 
-NO_STAGE=	yes
 post-build:
 	@(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKE_ARGS} qtr.pro ; ${GMAKE})
 
@@ -39,14 +36,12 @@ do-install:
 	@(cd ${WRKSRC}/qt ; ${SETENV} INSTALL_ROOT=${PREFIX} ${MAKE} install)
 
 post-install: general-install
-.ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/qt/README.txt ${DOCSDIR}/README-qt4
-.endif
+	@${INSTALL_DATA} ${WRKSRC}/qt/README.txt \
+		${STAGEDIR}${DOCSDIR}/README-qt4
 	@${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
-		${PREFIX}/share/applications/
+		${STAGEDIR}${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
-		${PREFIX}/share/pixmaps/transmission-qt.png
-	@-update-desktop-database
+		${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png
 
 .include "${MASTERDIR}/Makefile"

Modified: head/net-p2p/transmission-qt4/pkg-plist
==============================================================================
--- head/net-p2p/transmission-qt4/pkg-plist	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission-qt4/pkg-plist	Sun Dec 29 17:08:28 2013	(r338028)
@@ -1,4 +1,5 @@
 bin/transmission-qt
+man/man1/transmission-qt.1.gz
 share/applications/transmission-qt.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -6,5 +7,3 @@ share/applications/transmission-qt.deskt
 %%PORTDOCS%%%%DOCSDIR%%/README-qt4
 share/pixmaps/transmission-qt.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Modified: head/net-p2p/transmission/Makefile
==============================================================================
--- head/net-p2p/transmission/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/net-p2p/transmission/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -17,8 +17,8 @@ RUN_DEPENDS=	transmission-cli:${PORTSDIR
 CONFLICTS_INSTALL=      ${PORTNAME}${PKGNAMESUFFIX}-2.[56]*
 
 NO_BUILD=	yes
+NO_MTREE=	yes
 
-NO_STAGE=	yes
 do-install:
 	@${DO_NADA}
 

Modified: head/security/gorilla/Makefile
==============================================================================
--- head/security/gorilla/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/security/gorilla/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -17,7 +17,6 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	itcl>=3.4:${PORTSDIR}/lang/itcl \
 		wish:${PORTSDIR}/x11-toolkits/tk-wrapper
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
@@ -34,8 +33,7 @@ WITHOUTSO=	"@comment "
 PLIST_SUB+=	GORILLAARCH=${GORILLAARCH:L} WITHOUTSO=${WITHOUTSO}
 
 WRKSRC=		${WRKDIR}/zdia-${PORTNAME}-${DISTVERSIONSUFFIX}
-USE_TCL_RUN=	85+
-USE_TK=		85+
+USES=		tk:85+,run
 SUB_FILES=	gorilla
 SUB_LIST=	WISH=${WISH}
 PORTDOCS=	*
@@ -61,26 +59,22 @@ do-build:
 
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/gorilla
-	@${INSTALL_SCRIPT} ${WRKSRC}/sources/*.tcl ${PREFIX}/lib/gorilla
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gorilla
+	@${INSTALL_SCRIPT} ${WRKSRC}/sources/*.tcl \
+		${STAGEDIR}${PREFIX}/lib/gorilla
 .for dir in ${SRC_DIRS}
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}/${dir}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${dir}
 	@cd ${WRKSRC}/sources/${dir} \
 		&& ${COPYTREE_SHARE} \* \
-		${PREFIX}/lib/${PORTNAME}/${dir}
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${dir}
 .endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 post-install:
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gorilla
-	@${FIND} ${PREFIX}/lib/${PORTNAME}/ -name "*.tcl" \
-		| ${XARGS} ${CHMOD} ${BINMODE}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README			\
 		${WRKSRC}/sources/README.install-from-source	\
 		${WRKSRC}/sources/CHANGES.txt			\
-	   ${DOCSDIR}
-.endif
+	   ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/aird/Makefile
==============================================================================
--- head/sysutils/aird/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/sysutils/aird/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -8,19 +8,16 @@ MASTER_SITES=	http://www.bayofrum.net/di
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Handles Apple IR receiver button events
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 USE_RC_SUBR=	${PORTNAME}
-MAN1=		${PORTNAME}.1
-MANCOMPRESSED=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1}.gz ${MAN1PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.mk>

Modified: head/sysutils/reed/Makefile
==============================================================================
--- head/sysutils/reed/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/sysutils/reed/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -5,7 +5,7 @@ PORTNAME=	reed
 PORTVERSION=	5.4
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}
+MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	A text pager with autoscrolling and more
@@ -13,14 +13,12 @@ COMMENT=	A text pager with autoscrolling
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run build patch
+SHEBANG_FILES=	wrap breed
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configures
 
-MAN1=	breed.1 reed.1 wrap.1
-
-NO_STAGE=	yes
 post-patch:
 	@${PERL} -pi -e 's!/usr/local!${PREFIX}!g' ${WRKSRC}/configures
 	@${PERL} -pi -e 's!sys/dir.h!dirent.h!g;s!.*getopt.h.*\n!!' \
@@ -31,13 +29,11 @@ post-patch:
 		${WRKSRC}/fix_bookmarks.pl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/reed ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/breed ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/wrap ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/fix_bookmarks.pl ${DATADIR}
-.for file in ${MAN1}
-	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/man/man1
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/reed ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/breed ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/wrap ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/fix_bookmarks.pl ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/sysutils/reed/pkg-plist
==============================================================================
--- head/sysutils/reed/pkg-plist	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/sysutils/reed/pkg-plist	Sun Dec 29 17:08:28 2013	(r338028)
@@ -1,5 +1,8 @@
 bin/breed
 bin/reed
 bin/wrap
+man/man1/breed.1.gz
+man/man1/reed.1.gz
+man/man1/wrap.1.gz
 share/reed/fix_bookmarks.pl
 @dirrm share/reed

Modified: head/textproc/atom/Makefile
==============================================================================
--- head/textproc/atom/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/textproc/atom/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -12,25 +12,15 @@ COMMENT=	Converts text files to html wit
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-MAN1=	atom.1
-MANCOMPRESSED=	no
-
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/atom
-PORTDOCS=	README \
-		TODO \
-		testFile
+PLIST_FILES=	bin/atom man/man1/atom.1.gz
+PORTDOCS=	README TODO testFile
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.	for DOC in ${PORTDOCS}
-		${CP} -R ${WRKSRC}/${DOC} ${DOCSDIR}/
-.	endfor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/www/p5-CGI-Enurl/Makefile
==============================================================================
--- head/www/p5-CGI-Enurl/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/www/p5-CGI-Enurl/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -14,7 +14,4 @@ RUN_DEPENDS=	p5-CGI.pm>=0:${PORTSDIR}/ww
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		CGI::Enurl.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/www/p5-CGI-Enurl/pkg-plist
==============================================================================
--- head/www/p5-CGI-Enurl/pkg-plist	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/www/p5-CGI-Enurl/pkg-plist	Sun Dec 29 17:08:28 2013	(r338028)
@@ -1,3 +1,4 @@
 %%SITE_PERL%%/CGI/Enurl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Enurl/.packlist
+%%PERL5_MAN3%%/CGI::Enurl.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Enurl

Modified: head/www/transmission-web/Makefile
==============================================================================
--- head/www/transmission-web/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/www/transmission-web/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -17,12 +17,11 @@ PORTDOCS=	*
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 post-extract:
 	@${FIND} ${WRKSRC}/web -name Makefile.* -delete
 
 do-install:
-	@${MKDIR} ${DATADIR}/web
-	@(cd ${WRKSRC}/web && ${COPYTREE_SHARE} \* ${DATADIR}/web)
+	${MKDIR} ${STAGEDIR}${DATADIR}/web
+	(cd ${WRKSRC}/web && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/web)
 
 .include "${MASTERDIR}/Makefile"

Modified: head/x11-toolkits/skinlf/Makefile
==============================================================================
--- head/x11-toolkits/skinlf/Makefile	Sun Dec 29 16:35:06 2013	(r338027)
+++ head/x11-toolkits/skinlf/Makefile	Sun Dec 29 17:08:28 2013	(r338028)
@@ -1,4 +1,3 @@
-# Created by: Chris Rees
 # $FreeBSD$
 
 PORTNAME=	skinlf
@@ -11,6 +10,9 @@ MASTER_SITES=	https://skinlf.dev.java.ne
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Allows Java developers to write skinnable applications in Swing
 
+LICENSE=	BSD4CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_ZIP=	yes
@@ -23,10 +25,11 @@ NO_BUILD=	yes
 PLIST_FILES=	%%JAVAJARDIR%%/${JAR_NAME} \
 		%%JAVAJARDIR%%/themepack.zip
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_DATA} "${WRKSRC}/lib/${JAR_NAME}" ${JAVAJARDIR}/${JAR_NAME}
-	${INSTALL_DATA} "${WRKSRC}/lib/themepack.zip" ${JAVAJARDIR}/themepack.zip
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/${JAR_NAME} \
+		${STAGEDIR}${JAVAJARDIR}/${JAR_NAME}
+	${INSTALL_DATA} ${WRKSRC}/lib/themepack.zip \
+		${STAGEDIR}${JAVAJARDIR}/themepack.zip
 
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list