Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Sep 2015 17:39:08 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396593 - head/databases/adodb5
Message-ID:  <201509101739.t8AHd8dA008079@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-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 <bsd.port.mk>

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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509101739.t8AHd8dA008079>