svn commit: r355482 - in head: benchmarks/super-smack databases/glom databases/gtksql databases/hk_classes databases/jasperserver databases/libgda4 databases/libgda5
Baptiste Daroussin
bapt at FreeBSD.org
Tue May 27 10:42:14 UTC 2014
Author: bapt
Date: Tue May 27 10:42:11 2014
New Revision: 355482
URL: http://svnweb.freebsd.org/changeset/ports/355482
QAT: https://qat.redports.org/buildarchive/r355482/
Log:
Convert to USES=pgsql
With hat: portmgr
Modified:
head/benchmarks/super-smack/Makefile
head/databases/glom/Makefile
head/databases/gtksql/Makefile
head/databases/hk_classes/Makefile
head/databases/jasperserver/Makefile
head/databases/libgda4/Makefile
head/databases/libgda5/Makefile
Modified: head/benchmarks/super-smack/Makefile
==============================================================================
--- head/benchmarks/super-smack/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/benchmarks/super-smack/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--with-mysql \
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pgsql \
--with-pgsql-include=${LOCALBASE}/include \
--with-pgsql-lib=${LOCALBASE}/lib
Modified: head/databases/glom/Makefile
==============================================================================
--- head/databases/glom/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/databases/glom/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -26,14 +26,12 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
-USE_BZIP2= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
- pkgconfig shared-mime-info
+ pgsql pkgconfig shared-mime-info tar:bzip2
USE_GNOME= gnomedocutils gnomeprefix pygnomeextras
USE_LDCONFIG= yes
-USE_PGSQL= yes
INSTALLS_OMF= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -41,8 +39,8 @@ CONFIGURE_ARGS= --with-postgres-utils=${
INSTALLS_ICONS= yes
# Note: USE_PGSQL has already been set above.
-BUILD_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-RUN_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+BUILD_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
+RUN_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libglom-1.12.so.0.0.0
Modified: head/databases/gtksql/Makefile
==============================================================================
--- head/databases/gtksql/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/databases/gtksql/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -29,6 +29,9 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="$
CPPFLAGS+= -I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
+PGSQL_USES= pgsql
+PGSQL_CONFIGURE_WITH= postgresql
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MAVAHI}
@@ -45,12 +48,6 @@ LDFLAGS+= -L${LOCALBASE}/lib/mysql
CONFIGURE_ARGS+= --without-mysql
.endif
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
-.else
-CONFIGURE_ARGS+= --without-postgresql
-.endif
-
.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= yes
.else
Modified: head/databases/hk_classes/Makefile
==============================================================================
--- head/databases/hk_classes/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/databases/hk_classes/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -14,8 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/argp
LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libxml2.so:${PORTSDIR}/textproc/libxml2
-USES= pkgconfig gettext iconv
-USE_BZIP2= yes
+USES= pkgconfig gettext iconv tar:bzip2
USE_PYTHON= yes
CXXFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
@@ -65,7 +64,7 @@ PLIST_SUB+= DBASE="@comment "
.endif
.if ${PORT_OPTIONS:MPOSTGRESQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --with-postgres-incdir=${LOCALBASE}/include/ \
--with-postgres-libdir=${LOCALBASE}/lib
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
Modified: head/databases/jasperserver/Makefile
==============================================================================
--- head/databases/jasperserver/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/databases/jasperserver/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -68,7 +68,6 @@ PLIST_SUB= DATABASE=${DATABASE} \
PORTDOCS= *
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MHEADLESS}
@@ -91,9 +90,8 @@ PLIST_SUB+= JDBC="mysql-connector-java.j
#use version 90, application is certified w/ pg90
.if ${PORT_OPTIONS:MPGSQL}
-WANT_PGSQL_VER= 90+
JDBC= postgresql-9.2-1002.jdbc4.jar
-USE_PGSQL= yes
+USES+= pgsql:90+
DBUSER?= pgsql
DBPASS?= pgsql
DATABASE= postgresql
@@ -148,13 +146,11 @@ post-patch:
@${ECHO_MSG} " [ DONE ]"
.endfor
@${REINPLACE_CMD} -e 's|--DROP|-- DROP|' ${SQLSRC}/mysql/quartz.ddl
-
-post-patch-script:
@${ECHO_MSG} -n ">> Removing unneeded patched files..."
@${FIND} ${WRKDIR} -type f \( -name '*.orig' \) -delete
@${ECHO_MSG} " [ DONE ]"
-pre-build: extract patch
+pre-build:
@${MKDIR} ${JSREPO}/org/codehaus/mojo/cobertura-maven-plugin/2.5-Jaspersoft
@${CP} ${DISTDIR}/${DIST_SUBDIR}/cobertura-* ${JSREPO}/org/codehaus/mojo/cobertura-maven-plugin/2.5-Jaspersoft
Modified: head/databases/libgda4/Makefile
==============================================================================
--- head/databases/libgda4/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/databases/libgda4/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+= --without-mysql
.endif
.if ${LIBGDA4_SLAVE}=="postgresql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-postgres
Modified: head/databases/libgda5/Makefile
==============================================================================
--- head/databases/libgda5/Makefile Tue May 27 10:37:39 2014 (r355481)
+++ head/databases/libgda5/Makefile Tue May 27 10:42:11 2014 (r355482)
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --without-mysql
.endif
.if ${LIBGDA5_SLAVE}==postgresql
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-postgres
More information about the svn-ports-head
mailing list