From owner-svn-ports-all@freebsd.org Thu Sep 10 17:39:08 2015 Return-Path: Delivered-To: svn-ports-all@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 BC834A007EA; Thu, 10 Sep 2015 17:39:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 A21E019C0; Thu, 10 Sep 2015 17:39:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8AHd8P8008081; Thu, 10 Sep 2015 17:39:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8AHd8dA008079; Thu, 10 Sep 2015 17:39:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509101739.t8AHd8dA008079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 10 Sep 2015 17:39:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396593 - head/databases/adodb5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2015 17:39:08 -0000 Author: amdmi3 Date: Thu Sep 10 17:39:07 2015 New Revision: 396593 URL: https://svnweb.freebsd.org/changeset/ports/396593 Log: - Switch to USES=tar - Fix LICENSE - Fix staging with TESTS - Fix install commands for docs - Add NO_ARCH - Switch to options helpers - Fix WWW: Modified: head/databases/adodb5/Makefile head/databases/adodb5/pkg-descr Modified: head/databases/adodb5/Makefile ============================================================================== --- head/databases/adodb5/Makefile Thu Sep 10 17:39:01 2015 (r396592) +++ head/databases/adodb5/Makefile Thu Sep 10 17:39:07 2015 (r396593) @@ -11,7 +11,8 @@ PKGNAMESUFFIX= 5 MAINTAINER= ports@FreeBSD.org COMMENT= Database library for PHP -LICENSE= BSD4CLAUSE +LICENSE= BSD4CLAUSE LGPL21 +LICENSE_COMB= dual CONFLICTS= adodb-4.* @@ -19,22 +20,16 @@ USES= zip USE_PHP= pcre WRKSRC= ${WRKDIR}/${PORTNAME}5 -NO_BUILD= YES +NO_BUILD= yes +NO_ARCH= yes +SUB_FILES= pkg-message ADODB_SUBDIRS= contrib datadict drivers lang pear perf session xsl OPTIONS_DEFINE= TESTS DOCS -TESTS_DESC= Install tests - -.include - -SUB_FILES+= pkg-message +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MTESTS} -PLIST_SUB+= TESTS= -.else -PLIST_SUB+= TESTS="@comment " -.endif +TESTS_DESC= Install tests do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @@ -45,19 +40,18 @@ do-install: @cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \ -exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \; -.if ${PORT_OPTIONS:MTESTS} - @${MKDIR} ${DATADIR}/tests +do-install-TESTS-on: + @${MKDIR} ${STAGEDIR}${DATADIR}/tests @cd ${WRKSRC}; ${FIND} tests -type f \ - -exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \; -.endif + -exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \; -post-install: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/cute_icons_for_site @cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \ - -exec ${INSTALL_MAN} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \; + -exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \; @cd ${WRKSRC}/docs; ${FIND} . -type f \ - -exec ${INSTALL_MAN} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \; + -exec ${INSTALL_DATA} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \; @cd ${WRKSRC}; ${FIND} cute_icons_for_site -type f \ - -exec ${INSTALL_MAN} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \; + -exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \; .include Modified: head/databases/adodb5/pkg-descr ============================================================================== --- head/databases/adodb5/pkg-descr Thu Sep 10 17:39:01 2015 (r396592) +++ head/databases/adodb5/pkg-descr Thu Sep 10 17:39:07 2015 (r396593) @@ -11,4 +11,4 @@ ODBC, ODBTP. The Sybase, Informix, FrontBase and PostgreSQL, Netezza, LDAP, ODBTP drivers are community contributions. -WWW: http://adodb.sourceforge.net +WWW: http://adodb.sourceforge.net/