svn commit: r429918 - in head: chinese/libchewing devel/libtpl devel/php-Psr_Log devel/php-uprofiler devel/qjson devel/qross mail/roundcube-thunderbird_labels security/honggfuzz security/proxytunne...

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Dec 29 14:29:22 UTC 2016 

Author: amdmi3
Date: Thu Dec 29 14:29:18 2016
New Revision: 429918
URL: https://svnweb.freebsd.org/changeset/ports/429918

Log:
  - Remove bogus (in presence of USE_GITHUB) USES=tar*
  - While here, minor cosmetic and license fixes
  
  Approved by:	portmgr blanket

Modified:
  head/chinese/libchewing/Makefile
  head/devel/libtpl/Makefile
  head/devel/php-Psr_Log/Makefile
  head/devel/php-uprofiler/Makefile
  head/devel/qjson/Makefile
  head/devel/qjson/pkg-descr
  head/devel/qross/Makefile
  head/mail/roundcube-thunderbird_labels/Makefile
  head/security/honggfuzz/Makefile
  head/security/proxytunnel/Makefile
  head/security/tripwire/Makefile
  head/sysutils/life-preserver/Makefile
  head/textproc/codespell/Makefile
  head/textproc/pecl-ctemplate/Makefile
  head/textproc/php-mecab/Makefile
  head/textproc/templates_parser/Makefile
  head/x11-toolkits/qtermwidget/Makefile

Modified: head/chinese/libchewing/Makefile
==============================================================================
--- head/chinese/libchewing/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/chinese/libchewing/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -15,13 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
-USES=		cmake libtool pathfix pkgconfig sqlite tar:bzip2
-USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	chewing
 
-CMAKE_ARGS+=	-DMAKEINFO=${LOCALBASE}/bin/makeinfo
-CFLAGS+=	-I${LOCALBASE}/include
+USES=		cmake libtool localbase pathfix pkgconfig sqlite
+CMAKE_ARGS=	-DMAKEINFO=${LOCALBASE}/bin/makeinfo
+USE_LDCONFIG=	yes
+
 INFO=		libchewing
 
 .include <bsd.port.mk>

Modified: head/devel/libtpl/Makefile
==============================================================================
--- head/devel/libtpl/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/devel/libtpl/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -14,7 +14,7 @@ LICENSE_COMB=	multi
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		libtool tar:bzip2
+USES=		libtool
 USE_GITHUB=	yes
 GH_ACCOUNT=	waitman
 GH_TAGNAME=	8fa17e5
@@ -29,7 +29,7 @@ PLIST_FILES=	lib/libtpl.a lib/libtpl.so 
 
 PORTDOCS=	ChangeLog.txt examples.txt userguide.txt compiling.txt
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}

Modified: head/devel/php-Psr_Log/Makefile
==============================================================================
--- head/devel/php-Psr_Log/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/devel/php-Psr_Log/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -12,14 +12,14 @@ COMMENT=	PSR-3 logger interface
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
- 
-USES=		tar:tgz
 
-NO_BUILD=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	php-fig
 GH_PROJECT=	log
 
+NO_BUILD=	yes
+NO_ARCH=	yes
+
 PLIST_FILES=	share/pear/Psr/Log/AbstractLogger.php \
 		share/pear/Psr/Log/InvalidArgumentException.php \
 		share/pear/Psr/Log/LogLevel.php \
@@ -31,7 +31,7 @@ PLIST_FILES=	share/pear/Psr/Log/Abstract
 		share/pear/Psr/Log/Test/LoggerInterfaceTest.php
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/pear/Psr/Log/Test
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pear/Psr/Log/Test
 .for file in ${PLIST_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${file:S/share\/pear\///} ${STAGEDIR}${PREFIX}/${file}
 .endfor

Modified: head/devel/php-uprofiler/Makefile
==============================================================================
--- head/devel/php-uprofiler/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/devel/php-uprofiler/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -11,6 +11,7 @@ MAINTAINER=	gasol.wu at gmail.com
 COMMENT=	Lightweight profiler for PHP
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		Does not build: invokes x86 asm
 BROKEN_mips64=		Does not build: invokes x86 asm
@@ -22,7 +23,7 @@ GH_ACCOUNT=	FriendsOfPHP
 GH_TAGNAME=	483c1e5
 
 WRKSRC_SUBDIR=	extension
-USES=		php:ext tar:tgz
+USES=		php:ext
 IGNORE_WITH_PHP=	70
 
 .include <bsd.port.mk>

Modified: head/devel/qjson/Makefile
==============================================================================
--- head/devel/qjson/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/devel/qjson/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -9,11 +9,12 @@ MAINTAINER=	avilla at FreeBSD.org
 COMMENT=	Library to manage JSON objects with Qt
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flavio
 GH_TAGNAME=	${PORTVERSION}
-USES=		cmake pathfix tar:bzip2
+USES=		cmake pathfix
 USE_LDCONFIG=	yes
 
 .if empty(PKGNAMESUFFIX)
@@ -39,17 +40,11 @@ OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
-.include <bsd.port.options.mk>
-
-post-build:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${_DOCSDIR}
-	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${STAGEDIR}${_DOCSDIR}
-.endif
+	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${_DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/qjson/pkg-descr
==============================================================================
--- head/devel/qjson/pkg-descr	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/devel/qjson/pkg-descr	Thu Dec 29 14:29:18 2016	(r429918)
@@ -6,4 +6,4 @@ QJson is a Qt-based library that maps JS
 and vice versa. JSON arrays will be mapped to QVariantList instances,
 while JSON objects will be mapped to QVariantMap.
 
-WWW: http://qjson.sourceforge.net
+WWW: http://qjson.sourceforge.net/

Modified: head/devel/qross/Makefile
==============================================================================
--- head/devel/qross/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/devel/qross/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -9,7 +9,9 @@ CATEGORIES=	devel
 MAINTAINER=	vg at FreeBSD.org
 COMMENT=	Qt-only fork of Kross, the KDE scripting framework
 
-USES=		cmake tar:bzip2
+LICENSE=	LGPL20+
+
+USES=		cmake
 USE_LDCONFIG=	yes
 USE_QT4=	designer gui network xml qmake_build uic_build moc_build \
 		rcc_build script testlib

Modified: head/mail/roundcube-thunderbird_labels/Makefile
==============================================================================
--- head/mail/roundcube-thunderbird_labels/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/mail/roundcube-thunderbird_labels/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -14,7 +14,6 @@ LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	roundcube>=0.5:mail/roundcube
 
-USES=		tar:bzip2
 NO_BUILD=	yes
 NO_ARCH=	yes
 
@@ -34,8 +33,8 @@ x-generate-plist: build
 	    >${.CURDIR}/pkg-plist.tmp
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PLUGINDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PLUGINDIR}
+	@${MKDIR} ${STAGEDIR}${PLUGINDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PLUGINDIR}
 	cd ${STAGEDIR}${PLUGINDIR} && \
 		${MV} config.inc.php config.inc.php.sample
 

Modified: head/security/honggfuzz/Makefile
==============================================================================
--- head/security/honggfuzz/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/security/honggfuzz/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -11,7 +11,7 @@ COMMENT=	General-purpose fuzzer with sim
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake tar:tgz
+USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GC_TAGNAME=	6d01e82
@@ -22,12 +22,14 @@ BROKEN_FreeBSD_9=Does not build on 9.x: 
 
 # inplace replacement to remove relative binary path in examples scripts
 post-patch:
-	${REINPLACE_CMD} -i "" -E "s,\.\./,," ${WRKSRC}/examples/*.sh
-	${REINPLACE_CMD} -i "" -e 's,gcc,${CC},' \
+	@${REINPLACE_CMD} -i "" -E "s,\.\./,," ${WRKSRC}/examples/*.sh
+	@${REINPLACE_CMD} -i "" -e 's,gcc,${CC},' \
 		-e 's| -Werror||' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 

Modified: head/security/proxytunnel/Makefile
==============================================================================
--- head/security/proxytunnel/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/security/proxytunnel/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -8,12 +8,14 @@ CATEGORIES=	security
 MAINTAINER=	ehaupt at FreeBSD.org
 COMMENT=	Connects stdin and stdout to an origin server through an HTTPS proxy
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+ BSD3CLAUSE MIT
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		xmlto:textproc/xmlto
 
-USES=		pkgconfig gmake tar:tgz ssl
+USES=		pkgconfig gmake ssl
 USE_GITHUB=	yes
 
 PLIST_FILES=	bin/proxytunnel man/man1/proxytunnel.1.gz

Modified: head/security/tripwire/Makefile
==============================================================================
--- head/security/tripwire/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/security/tripwire/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -16,7 +16,7 @@ GH_PROJECT=	tripwire-open-source
 
 NO_LICENSES_INSTALL=	yes
 MAKE_JOBS_UNSAFE=	yes
-USES=		gmake tar:bzip2
+USES=		gmake
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	SYSPRE=${ARCH}-unknown-freebsd \
 		DESTDIR=${STAGEDIR}

Modified: head/sysutils/life-preserver/Makefile
==============================================================================
--- head/sysutils/life-preserver/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/sysutils/life-preserver/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -14,8 +14,9 @@ RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/sc
 		stunnel:security/stunnel
 
 WRKSRC_SUBDIR=	src-sh/lpreserver
-USES=		pkgconfig tar:xz
+USES=		pkgconfig
 NO_BUILD=	yes
+NO_ARCH=	yes
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
 USE_GITHUB=	yes

Modified: head/textproc/codespell/Makefile
==============================================================================
--- head/textproc/codespell/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/textproc/codespell/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -8,8 +8,9 @@ MAINTAINER=	gjb at FreeBSD.org
 COMMENT=	Source code spelling checker
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:3 tar:xz
+USES=		python:3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lucasdemarchi
@@ -18,25 +19,29 @@ GH_TAGNAME=	4cb7fe3
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PLIST_FILES=	bin/codespell
-PORTDOCS=	COPYING NEWS TODO
+PORTDOCS=	NEWS TODO
 PORTEXAMPLES=	*
 
+NO_ARCH=	yes
+
 SUB_FILES+=	pkg-message
 
 do-build:
-	${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
+	@${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
 		${WRKSRC}/codespell.py
-	${REINPLACE_CMD} "s|^default_dictionary = .*|default_dictionary = '${EXAMPLESDIR}/data/dictionary.txt'|" \
+	@${REINPLACE_CMD} "s|^default_dictionary = .*|default_dictionary = '${EXAMPLESDIR}/data/dictionary.txt'|" \
 		${WRKSRC}/codespell.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/codespell.py ${STAGEDIR}${PREFIX}/bin/codespell
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 . endfor
 
+do-install-EXAMPLES-on:
 .for i in data example
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${i}
 	${INSTALL_DATA} ${WRKSRC}/${i}/* ${STAGEDIR}${EXAMPLESDIR}/${i}

Modified: head/textproc/pecl-ctemplate/Makefile
==============================================================================
--- head/textproc/pecl-ctemplate/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/textproc/pecl-ctemplate/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -13,15 +13,12 @@ COMMENT=	PECL extension for ctemplate li
 
 LIB_DEPENDS=	libctemplate.so:textproc/google-ctemplate
 
-USES=		php:ext tar:xz
+USES=		php:ext localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	vanillahsu
 GH_PROJECT=	pecl-ctemplate
 IGNORE_WITH_PHP=	70
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
-
 CONFIGURE_ARGS=	--with-cTemplate=${LOCALBASE}
 
 .include <bsd.port.mk>

Modified: head/textproc/php-mecab/Makefile
==============================================================================
--- head/textproc/php-mecab/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/textproc/php-mecab/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -18,8 +18,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	rsky
 
 WRKSRC_SUBDIR=	mecab
-CONFIGURE_ARGS+=	--with-mecab=${LOCALBASE}/bin/mecab-config
-USES=		php:ext tar:tgz
+CONFIGURE_ARGS=	--with-mecab=${LOCALBASE}/bin/mecab-config
+USES=		php:ext
 PHP_MODNAME=	mecab
 
 .include <bsd.port.mk>

Modified: head/textproc/templates_parser/Makefile
==============================================================================
--- head/textproc/templates_parser/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/textproc/templates_parser/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -8,13 +8,14 @@ CATEGORIES=	textproc
 MAINTAINER=	marino at FreeBSD.org
 COMMENT=	Web page template engine module for the Ada Web Server
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING3
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild \
 		xmlada>=4.4:textproc/xmlada
 RUN_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
-USES=		ada:run gmake tar:bzip2
+USES=		ada:run gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdaCore
 GH_PROJECT=	templates-parser
@@ -22,7 +23,7 @@ GH_TAGNAME=	1d62939
 
 DESTINC=	${STAGEDIR}${PREFIX}/include/templates_parser
 PLIST_SUB=	LIBVER=${PORTVERSION:R}
-MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
+MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 		ENABLE_SHARED=true \
 		HOST=${CONFIGURE_TARGET} \
 		TARGET=${CONFIGURE_TARGET} \

Modified: head/x11-toolkits/qtermwidget/Makefile
==============================================================================
--- head/x11-toolkits/qtermwidget/Makefile	Thu Dec 29 14:20:46 2016	(r429917)
+++ head/x11-toolkits/qtermwidget/Makefile	Thu Dec 29 14:29:18 2016	(r429918)
@@ -8,9 +8,10 @@ CATEGORIES=	x11-toolkits
 MAINTAINER=	bacon4000 at gmail.com
 COMMENT=	Terminal widget for QTerminal
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource compiler:c++11-lang pkgconfig tar:xz
+USES=		cmake:outsource compiler:c++11-lang pkgconfig
 USE_LDCONFIG=	yes
 USE_QT5=	buildtools_build core gui qmake_build widgets

More information about the svn-ports-head mailing list