svn commit: r396592 - head/databases/adodb

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Sep 10 17:39:01 2015
New Revision: 396592
URL: https://svnweb.freebsd.org/changeset/ports/396592

Log:
  - Switch to USES=tar
  - Fix LICENSE
  - Fix install commands for docs
  - Add NO_ARCH
  - Switch to options helpers
  - Fix WWW:

Modified:
  head/databases/adodb/Makefile
  head/databases/adodb/pkg-descr

Modified: head/databases/adodb/Makefile
==============================================================================
--- head/databases/adodb/Makefile	Thu Sep 10 17:38:50 2015	(r396591)
+++ head/databases/adodb/Makefile	Thu Sep 10 17:39:01 2015	(r396592)
@@ -6,34 +6,29 @@ PORTVERSION=	4.99.2
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php-4-and-5/${PORTNAME}-${PORTVERSION:S/.//g}-for-php
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Database library for PHP
 
-LICENSE=	BSD4CLAUSE
+LICENSE=	BSD4CLAUSE LGPL21
+LICENSE_COMB=	dual
 
+USES=		tar:tgz
 USE_PHP=	pcre
 
 CONFLICTS=	adodb-5.*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-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>
+OPTIONS_SUB=	yes
 
-SUB_FILES+=	pkg-message
-
-.if ${PORT_OPTIONS:MTESTS}
-PLIST_SUB+=	TESTS=
-.else
-PLIST_SUB+=	TESTS="@comment "
-.endif
+TESTS_DESC=	Install tests
 
 post-patch:
 	@cd ${WRKSRC}; ${RM} -f cute_icons_for_site/Thumbs.db
@@ -47,21 +42,18 @@ do-install:
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
 
-.if ${PORT_OPTIONS:MTESTS}
+do-install-TESTS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tests
 	@cd ${WRKSRC}; ${FIND} tests -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+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}/{} \;
-.endif
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
 
 .include <bsd.port.mk>

Modified: head/databases/adodb/pkg-descr
==============================================================================
--- head/databases/adodb/pkg-descr	Thu Sep 10 17:38:50 2015	(r396591)
+++ head/databases/adodb/pkg-descr	Thu Sep 10 17:39:01 2015	(r396592)
@@ -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/