Date: Mon, 31 Mar 2014 20:39:35 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349802 - in head/databases: evolution-data-server libgda4 libgda4-bdb libgda4-jdbc libgda4-ldap libgda4-mdb libgda4-mysql libgda4-postgresql libgda5 libgda5-bdb libgda5-jdbc libgda5-ld... Message-ID: <201403312039.s2VKdZY7074944@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Mon Mar 31 20:39:34 2014 New Revision: 349802 URL: http://svnweb.freebsd.org/changeset/ports/349802 QAT: https://qat.redports.org/buildarchive/r349802/ Log: Stagify. Modified: head/databases/evolution-data-server/Makefile head/databases/libgda4-bdb/Makefile head/databases/libgda4-jdbc/Makefile head/databases/libgda4-ldap/Makefile head/databases/libgda4-mdb/Makefile head/databases/libgda4-mysql/Makefile head/databases/libgda4-postgresql/Makefile head/databases/libgda4/Makefile head/databases/libgda4/pkg-plist head/databases/libgda5-bdb/Makefile head/databases/libgda5-jdbc/Makefile head/databases/libgda5-ldap/Makefile head/databases/libgda5-mdb/Makefile head/databases/libgda5-mysql/Makefile head/databases/libgda5-postgresql/Makefile head/databases/libgda5-ui/Makefile head/databases/libgda5-ui/pkg-plist head/databases/libgda5/Makefile head/databases/libgda5/pkg-plist Modified: head/databases/evolution-data-server/Makefile ============================================================================== --- head/databases/evolution-data-server/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/evolution-data-server/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -43,7 +43,6 @@ OPTIONS_DEFINE= WEATHER KERBEROS OPTIONS_DEFAULT=WEATHER KERBEROS WEATHER_DESC= Weather calendar backend -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MKERBEROS} Modified: head/databases/libgda4-bdb/Makefile ============================================================================== --- head/databases/libgda4-bdb/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4-bdb/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -15,5 +15,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA4_SLAVE= bdb -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda4-jdbc/Makefile ============================================================================== --- head/databases/libgda4-jdbc/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4-jdbc/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -15,5 +15,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA4_SLAVE= jdbc -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda4-ldap/Makefile ============================================================================== --- head/databases/libgda4-ldap/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4-ldap/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA4_SLAVE= ldap -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda4-mdb/Makefile ============================================================================== --- head/databases/libgda4-mdb/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4-mdb/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,8 +16,6 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA4_SLAVE= mdb -NO_STAGE= yes - post-extract: @${REINPLACE_CMD} -e 's|MDB_SDATETIME|MDB_DATETIME|g' \ ${WRKSRC}/providers/mdb/gda-mdb-provider.c \ Modified: head/databases/libgda4-mysql/Makefile ============================================================================== --- head/databases/libgda4-mysql/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4-mysql/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA4_SLAVE= mysql -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda4-postgresql/Makefile ============================================================================== --- head/databases/libgda4-postgresql/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4-postgresql/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA4_SLAVE= postgresql -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda4/Makefile ============================================================================== --- head/databases/libgda4/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -4,7 +4,7 @@ PORTNAME= libgda PORTVERSION= 4.2.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 4 @@ -46,7 +46,6 @@ SOUP_DESC= Web provider KEYRING_DESC= Support gnome-keyring .endif -NO_STAGE= yes .include <bsd.port.options.mk> VERSION= 4.0 @@ -159,7 +158,8 @@ pre-build: .if ${LIBGDA4_SLAVE}=="no" post-install: ${INSTALL_DATA} ${WRKSRC}/data/config \ - ${PREFIX}/etc/libgda-${VERSION}/config.default + ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.default + @${RM} -f ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config .endif .include <bsd.port.mk> Modified: head/databases/libgda4/pkg-plist ============================================================================== --- head/databases/libgda4/pkg-plist Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda4/pkg-plist Mon Mar 31 20:39:34 2014 (r349802) @@ -174,6 +174,8 @@ libdata/pkgconfig/libgda-sqlite-%%VERSIO %%UI%%libdata/pkgconfig/libgda-ui-%%VERSION%%.pc %%WEB%%libdata/pkgconfig/libgda-web-%%VERSION%%.pc libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc +man/man1/gda-sql-%%VERSION%%.1.gz +man/man1/gda-sql.1.gz %%UI%%share/applications/gda-browser-%%VERSION%%.desktop %%UI%%share/applications/gda-control-center-%%VERSION%%.desktop %%UI%%share/doc/gda-browser/UILayout.png @@ -899,7 +901,6 @@ share/libgda-%%VERSION%%/gda_trml2pdf/ut %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/ldap-entries.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/table-add.png -%%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg Modified: head/databases/libgda5-bdb/Makefile ============================================================================== --- head/databases/libgda5-bdb/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-bdb/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= bdb -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda5-jdbc/Makefile ============================================================================== --- head/databases/libgda5-jdbc/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-jdbc/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= jdbc -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda5-ldap/Makefile ============================================================================== --- head/databases/libgda5-ldap/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-ldap/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= ldap -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda5-mdb/Makefile ============================================================================== --- head/databases/libgda5-mdb/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-mdb/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,8 +16,6 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= mdb -NO_STAGE= yes - post-extract: @${REINPLACE_CMD} -e 's|MDB_SDATETIME|MDB_DATETIME|g' \ ${WRKSRC}/providers/mdb/gda-mdb-provider.c \ Modified: head/databases/libgda5-mysql/Makefile ============================================================================== --- head/databases/libgda5-mysql/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-mysql/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= mysql -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda5-postgresql/Makefile ============================================================================== --- head/databases/libgda5-postgresql/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-postgresql/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -16,5 +16,4 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= postgresql -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda5-ui/Makefile ============================================================================== --- head/databases/libgda5-ui/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-ui/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -12,19 +12,18 @@ COMMENT= The libgda 5 ui library MASTERDIR= ${.CURDIR}/../libgda5 PLIST= ${.CURDIR}/pkg-plist -CONFLICTS= libgda4-4.* +#CONFLICTS= libgda4-4.* LIBGDA5_SLAVE= ui -NO_STAGE= yes do-build: @cd ${WRKSRC}/libgda-ui && ${GMAKE} @cd ${WRKSRC}/control-center && ${GMAKE} @cd ${WRKSRC}/tools/browser && ${GMAKE} do-install: - @cd ${WRKSRC}/libgda-ui && ${GMAKE} install - @cd ${WRKSRC}/control-center && ${GMAKE} install - @cd ${WRKSRC}/tools/browser && ${GMAKE} install + @cd ${WRKSRC}/libgda-ui && DESTDIR=${STAGEDIR} ${GMAKE} install + @cd ${WRKSRC}/control-center && DESTDIR=${STAGEDIR} ${GMAKE} install + @cd ${WRKSRC}/tools/browser && DESTDIR=${STAGEDIR} ${GMAKE} install .include "${MASTERDIR}/Makefile" Modified: head/databases/libgda5-ui/pkg-plist ============================================================================== --- head/databases/libgda5-ui/pkg-plist Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5-ui/pkg-plist Mon Mar 31 20:39:34 2014 (r349802) @@ -29,6 +29,7 @@ include/libgda-%%VERSION%%/libgda-ui/gda include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml +lib/libgda-%%VERSION%%/plugins/gdaui-entry-format-spec.xml lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml @@ -45,7 +46,6 @@ share/applications/gda-browser-%%VERSION share/applications/gda-control-center-%%VERSION%%.desktop share/doc/gda-browser/BrowserConnection.html share/doc/gda-browser/BrowserCore.html -share/doc/gda-browser/BrowserFavorites.html share/doc/gda-browser/BrowserPerspective.html share/doc/gda-browser/BrowserWindow.html share/doc/gda-browser/CcGrayBar.html @@ -60,6 +60,7 @@ share/doc/gda-browser/gda-browser-Query- share/doc/gda-browser/gda-browser-Schema-Browser-perspective.html share/doc/gda-browser/gda-browser-Support-functions.html share/doc/gda-browser/gda-browser-UiFormgrid.html +share/doc/gda-browser/gda-browser-browser-favorites.html share/doc/gda-browser/gda-browser-popup-container.html share/doc/gda-browser/gda-browser.devhelp2 share/doc/gda-browser/home.png @@ -446,7 +447,6 @@ share/libgda-%%VERSION%%/icons/hicolor/3 share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/ldap-entries.png share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/table-add.png -share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg Modified: head/databases/libgda5/Makefile ============================================================================== --- head/databases/libgda5/Makefile Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5/Makefile Mon Mar 31 20:39:34 2014 (r349802) @@ -35,15 +35,12 @@ CONFIGURE_ARGS= --without-oracle \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include <bsd.port.options.mk> VERSION= 5.0 PLIST_SUB= VERSION=${VERSION} -.if ${LIBGDA5_SLAVE}=="no" -MAN1= gda-sql-5.0.1 -.else +.if ${LIBGDA5_SLAVE}!="no" USE_GNOME+= libgda5 .endif @@ -132,12 +129,13 @@ pre-build: .if ${LIBGDA5_SLAVE}==no post-install: ${INSTALL_DATA} ${WRKSRC}/data/config \ - ${PREFIX}/etc/libgda-${VERSION}/config.default + ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.default + @${RM} -f ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config .endif .if ${LIBGDA5_SLAVE}==ui post-install: ${INSTALL_DATA} ${WRKSRC}/libgda-ui-5.0.pc \ - ${PREFIX}/libdata/pkgconfig/ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ .endif .include <bsd.port.mk> Modified: head/databases/libgda5/pkg-plist ============================================================================== --- head/databases/libgda5/pkg-plist Mon Mar 31 20:29:39 2014 (r349801) +++ head/databases/libgda5/pkg-plist Mon Mar 31 20:39:34 2014 (r349802) @@ -128,6 +128,7 @@ libdata/pkgconfig/libgda-report-%%VERSIO libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc libdata/pkgconfig/libgda-web-%%VERSION%%.pc libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc +man/man1/gda-sql-%%VERSION%%.1.gz share/doc/libgda-%%VERSION%%/DataModels.png share/doc/libgda-%%VERSION%%/GdaBatch.html share/doc/libgda-%%VERSION%%/GdaBlobOp.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403312039.s2VKdZY7074944>