svn commit: r356898 - in head/devel: poco poco-ssl

[Alexey Dokuchaev]

Author: danfe
Date: Sat Jun  7 12:07:35 2014
New Revision: 356898
URL: http://svnweb.freebsd.org/changeset/ports/356898
QAT: https://qat.redports.org/buildarchive/r356898/

Log:
  - Provide a more descriptive COMMENT (taken from the sf.net page)
  - Do not abuse GNU_CONFIGURE knob for non-GNU, custom configure script
  - Stagify; cleanup; define LICENSE (BSL); utilize OPTIONS helpers, etc.
    (applicable to `devel/poco-ssl' port only)

Modified:
  head/devel/poco-ssl/Makefile
  head/devel/poco-ssl/pkg-descr
  head/devel/poco/Makefile

Modified: head/devel/poco-ssl/Makefile
==============================================================================
--- head/devel/poco-ssl/Makefile	Sat Jun  7 12:02:17 2014	(r356897)
+++ head/devel/poco-ssl/Makefile	Sat Jun  7 12:07:35 2014	(r356898)
@@ -1,61 +1,41 @@
-# Created by: wes at FreeBSD.org
+# Created by: Wes Peters <wes at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	poco
+# New version 1.4.6p4 is available; please use DISTVERSION upon updating
 PORTVERSION=	1.4.3
 PORTREVISION=	3
 CATEGORIES=	devel net
 MASTER_SITES=	SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-ssl
-DISTNAME=	poco-${PORTVERSION}p1-all
+DISTNAME=	${PORTNAME}-${PORTVERSION}p1-all
 
 MAINTAINER=	wes at FreeBSD.org
-COMMENT=	C++ Portable Components library with NetSSL and Database libraries
+COMMENT=	C++ libraries with a network/internet focus (full version)
 
-BROKEN=		Fails to build
+LICENSE=	BSL
 
 CONFLICTS=	poco-[0-9]*
 
-OPTIONS_DEFINE=	TEST SAMPLES MYSQL SQLITE ODBC
-SAMPLES_DESC=	Build sample programs
-
-OPTIONS_DEFAULT=	MYSQL SQLITE
-
-CONFIGURE_ARGS= --config=FreeBSD
-
 USES=		gmake tar:bzip2
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --config=FreeBSD
+USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	TEST SAMPLES MYSQL SQLITE ODBC
+OPTIONS_DEFAULT=	MYSQL SQLITE
+SAMPLES_DESC=	Build sample programs
 
-.if ! ${PORT_OPTIONS:MTEST}
-CONFIGURE_ARGS+= --no-tests
-.endif
-
-.if ! ${PORT_OPTIONS:MSAMPLES}
-CONFIGURE_ARGS+= --no-samples
-.endif
-
-#
-# ODBC
-#
+TEST_CONFIGURE_OFF=	--no-tests
+SAMPLES_CONFIGURE_OFF=	--no-samples
 
-ODBC_CONFIGURE_OFF= --omit=Data/ODBC
 ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/libiodbc
+ODBC_CONFIGURE_OFF=	--omit=Data/ODBC
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-.else
-CONFIGURE_ARGS+= --omit=Data/MySQL
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
-.else
-CONFIGURE_ARGS+= --omit=Data/SQLite
-.endif
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_OFF=	--omit=Data/MySQL
 
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+SQLITE_USE=		SQLITE=yes
+SQLITE_CONFIGURE_OFF=	--omit=Data/SQLite
 
 .include <bsd.port.mk>

Modified: head/devel/poco-ssl/pkg-descr
==============================================================================
--- head/devel/poco-ssl/pkg-descr	Sat Jun  7 12:02:17 2014	(r356897)
+++ head/devel/poco-ssl/pkg-descr	Sat Jun  7 12:07:35 2014	(r356898)
@@ -18,4 +18,4 @@ more.  The remaining libraries include:
 This is now known as the '-all' distribution by the Poco project,
 but the FreeBSD port remains named -ssl for hysterical raisins.
 
-WWW: http://pocoproject.org
+WWW: http://pocoproject.org/

Modified: head/devel/poco/Makefile
==============================================================================
--- head/devel/poco/Makefile	Sat Jun  7 12:02:17 2014	(r356897)
+++ head/devel/poco/Makefile	Sat Jun  7 12:07:35 2014	(r356898)
@@ -9,15 +9,15 @@ MASTER_SITES=	SF/${PORTNAME}/sources/${P
 DISTNAME=	${PORTNAME}-${PORTVERSION}p1
 
 MAINTAINER=	wes at FreeBSD.org
-COMMENT=	C++ Portable Components library
+COMMENT=	C++ libraries with a network/internet focus
 
 LICENSE=	BSL
 
 CONFLICTS=	poco-ssl-[0-9]*
 
 USES=		gmake tar:bzip2
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--config=FreeBSD
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --config=FreeBSD
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	TEST SAMPLES