Stagify.

19 files changed, 16 insertions, 32 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 8173fddee161..d80427afa6f5 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -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}
diff --git a/databases/libgda4-bdb/Makefile b/databases/libgda4-bdb/Makefile
index a454e0e8f605..144640eaae1d 100644
--- a/databases/libgda4-bdb/Makefile
+++ b/databases/libgda4-bdb/Makefile
@@ -15,5 +15,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA4_SLAVE=	bdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4-jdbc/Makefile b/databases/libgda4-jdbc/Makefile
index 64908740473a..c6b4c72f8edb 100644
--- a/databases/libgda4-jdbc/Makefile
+++ b/databases/libgda4-jdbc/Makefile
@@ -15,5 +15,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA4_SLAVE=	jdbc
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4-ldap/Makefile b/databases/libgda4-ldap/Makefile
index 916184886569..3b5aa427c5b1 100644
--- a/databases/libgda4-ldap/Makefile
+++ b/databases/libgda4-ldap/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA4_SLAVE=	ldap
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4-mdb/Makefile b/databases/libgda4-mdb/Makefile
index c12f978b4c2b..1f98f8dc4afc 100644
--- a/databases/libgda4-mdb/Makefile
+++ b/databases/libgda4-mdb/Makefile
@@ -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 \
diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
index 04f4adc42701..dc815e5a8e59 100644
--- a/databases/libgda4-mysql/Makefile
+++ b/databases/libgda4-mysql/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA4_SLAVE=	mysql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
index b183148cb44a..e966b61630c6 100644
--- a/databases/libgda4-postgresql/Makefile
+++ b/databases/libgda4-postgresql/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA4_SLAVE=	postgresql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 660dfe302d21..0970c1cf0c6c 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -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>
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index bc5b5edc5920..d9ba27189abd 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -174,6 +174,8 @@ libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
 %%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/utils.py
 %%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
diff --git a/databases/libgda5-bdb/Makefile b/databases/libgda5-bdb/Makefile
index 644ef5a7697f..2fee4faaf509 100644
--- a/databases/libgda5-bdb/Makefile
+++ b/databases/libgda5-bdb/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA5_SLAVE=	bdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-jdbc/Makefile b/databases/libgda5-jdbc/Makefile
index d83fdc18bab8..cf7033ecffdc 100644
--- a/databases/libgda5-jdbc/Makefile
+++ b/databases/libgda5-jdbc/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA5_SLAVE=	jdbc
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-ldap/Makefile b/databases/libgda5-ldap/Makefile
index 3538bb361935..e4975456924e 100644
--- a/databases/libgda5-ldap/Makefile
+++ b/databases/libgda5-ldap/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA5_SLAVE=	ldap
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-mdb/Makefile b/databases/libgda5-mdb/Makefile
index 673196983f39..e0d8b1c32668 100644
--- a/databases/libgda5-mdb/Makefile
+++ b/databases/libgda5-mdb/Makefile
@@ -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 \
diff --git a/databases/libgda5-mysql/Makefile b/databases/libgda5-mysql/Makefile
index c8cf8d9879e4..a7e0a9daa248 100644
--- a/databases/libgda5-mysql/Makefile
+++ b/databases/libgda5-mysql/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA5_SLAVE=	mysql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-postgresql/Makefile b/databases/libgda5-postgresql/Makefile
index 00d406c71494..7b0302ccb605 100644
--- a/databases/libgda5-postgresql/Makefile
+++ b/databases/libgda5-postgresql/Makefile
@@ -16,5 +16,4 @@ PLIST=		${.CURDIR}/pkg-plist
 
 LIBGDA5_SLAVE=	postgresql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile
index 6525769c7230..2fc326fd2f9e 100644
--- a/databases/libgda5-ui/Makefile
+++ b/databases/libgda5-ui/Makefile
@@ -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"
diff --git a/databases/libgda5-ui/pkg-plist b/databases/libgda5-ui/pkg-plist
index 9468ae798623..e15fff798fac 100644
--- a/databases/libgda5-ui/pkg-plist
+++ b/databases/libgda5-ui/pkg-plist
@@ -29,6 +29,7 @@ include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
 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%%.desktop
 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-Exec-perspective.html
 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/32x32/actions/glade.png
 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
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index c696d9479d7a..5b9a02de18be 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -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>
diff --git a/databases/libgda5/pkg-plist b/databases/libgda5/pkg-plist
index 2a21b48556fc..ea4251e7f230 100644
--- a/databases/libgda5/pkg-plist
+++ b/databases/libgda5/pkg-plist
@@ -128,6 +128,7 @@ libdata/pkgconfig/libgda-report-%%VERSION%%.pc
 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