* Use USE_MYSQL [1]

* Handle OMF files properly
* Use %%DOCSDIR%% in the plist

Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> [1]

2 files changed, 118 insertions, 142 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 50142f480493..cbf84a0afb06 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -33,18 +33,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gda-config-tool.1
 MAN5=		gda-config.5
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
-WITH_MYSQL3=	yes
-.endif
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/2$//}
 
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.12)
-WITH_MYSQL40=	yes
-.endif
+.include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)
-WITH_MYSQL41=	yes
+.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so)
+WITH_MYSQL=	yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libpq.so.3)
@@ -83,27 +77,13 @@ WITH_ODBC=	yes
 WITH_SQLITE=	yes
 .endif
 
-.if !defined(WITHOUT_MYSQL3) && defined(WITH_MYSQL3)
-LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-PLIST_SUB=		MYSQL:=""
-.endif
-
-.if !defined(WITHOUT_MYSQL40) && defined(WITH_MYSQL40)
-LIB_DEPENDS+=		mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-PLIST_SUB=		MYSQL:=""
-.endif
-
-.if !defined(WITHOUT_MYSQL41) && defined(WITH_MYSQL41)
-LIB_DEPENDS+=		mysqlclient.14:${PORTSDIR}/databases/mysql41-client
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-PLIST_SUB=		MYSQL:=""
-.endif
-
-.if !defined(WITH_MYSQL3) && !defined(WITH_MYSQL40) && !defined(WITH_MYSQL41)
+.if !defined(WITH_MYSQL)
 PLIST_SUB+=		MYSQL:="@comment "
 CONFIGURE_ARGS+=	--without-mysql
+.else
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+PLIST_SUB+=		MYSQL:=""
 .endif
 
 .if !defined(WITHOUT_POSTGRES7) && defined(WITH_POSTGRES7)
@@ -189,15 +169,9 @@ PLIST_SUB+=		SQLITE:="@comment "
 .endif
 
 pre-everything::
-.if !defined(WITH_MYSQL3)
-	@${ECHO_MSG} "You can enable support for MySQL 3 databases by defining WITH_MYSQL3."
-.endif
-.if !defined(WITH_MYSQL40)
-	@${ECHO_MSG} "You can enable support for MySQL 4.0 databases by defining WITH_MYSQL40."
+.if !defined(WITH_MYSQL)
+	@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
 .endif
-.if !defined(WITH_MYSQL41)
-	@${ECHO_MSG} "You can enable support for MySQL 4.1 databases by defining WITH_MYSQL41."
-.endif 
 .if !defined(WITH_POSTGRES7)
 	@${ECHO_MSG} "You can enable support for Postgres 7.0 databases by defining WITH_POSTGRES7."
 .endif
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index cff24a95f0aa..2484de647f97 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -84,116 +84,117 @@ lib/libgdasql.so.0
 %%SQLITE:%%lib/libgda/providers/libgda-sqlite.so
 lib/libgda/providers/libgda-xml.so
 libdata/pkgconfig/libgda.pc
-share/doc/libgda/architecture.html
-share/doc/libgda/c689.html
-share/doc/libgda/c694.html
-share/doc/libgda/compiling.html
-share/doc/libgda/connecting.html
-share/doc/libgda/connections.html
-share/doc/libgda/data-model.html
-share/doc/libgda/fdl-section1.html
-share/doc/libgda/fdl-section10.html
-share/doc/libgda/fdl-section2.html
-share/doc/libgda/fdl-section3.html
-share/doc/libgda/fdl-section4.html
-share/doc/libgda/fdl-section5.html
-share/doc/libgda/fdl-section6.html
-share/doc/libgda/fdl-section7.html
-share/doc/libgda/fdl-section8.html
-share/doc/libgda/fdl-section9.html
-share/doc/libgda/fdl-using.html
-share/doc/libgda/fdl.html
-share/doc/libgda/gdavalue.html
-share/doc/libgda/index.html
-share/doc/libgda/index.sgml
-share/doc/libgda/installation-configuring.html
-share/doc/libgda/installation-installing.html
-share/doc/libgda/installation.html
-share/doc/libgda/introduction.html
-share/doc/libgda/libgda-api.html
-share/doc/libgda/libgda-gda-command.html
-share/doc/libgda/libgda-gda-config.html
-share/doc/libgda/libgda-gda-field.html
-share/doc/libgda/libgda-gda-log.html
-share/doc/libgda/libgda-gda-parameter.html
-share/doc/libgda/libgda-gda-quark-list.html
-share/doc/libgda/libgda-gda-report-types.html
-share/doc/libgda/libgda-gda-row.html
-share/doc/libgda/libgda-gda-util.html
-share/doc/libgda/libgda-gda-value.html
-share/doc/libgda/libgda-gda-xql-utils.html
-share/doc/libgda/libgda-gdabatch.html
-share/doc/libgda/libgda-gdaclient.html
-share/doc/libgda/libgda-gdaconnection.html
-share/doc/libgda/libgda-gdadatamodel.html
-share/doc/libgda/libgda-gdadatamodelarray.html
-share/doc/libgda/libgda-gdadatamodelhash.html
-share/doc/libgda/libgda-gdadatamodellist.html
-share/doc/libgda/libgda-gdaerror.html
-share/doc/libgda/libgda-gdaexport.html
-share/doc/libgda/libgda-gdareportdocument.html
-share/doc/libgda/libgda-gdareportitem.html
-share/doc/libgda/libgda-gdareportitemdetail.html
-share/doc/libgda/libgda-gdareportitemlabel.html
-share/doc/libgda/libgda-gdareportitempagefooter.html
-share/doc/libgda/libgda-gdareportitempageheader.html
-share/doc/libgda/libgda-gdareportitemrepfield.html
-share/doc/libgda/libgda-gdareportitemreport.html
-share/doc/libgda/libgda-gdareportitemreportfooter.html
-share/doc/libgda/libgda-gdareportitemreportheader.html
-share/doc/libgda/libgda-gdareportitemsqlquery.html
-share/doc/libgda/libgda-gdareportresult.html
-share/doc/libgda/libgda-gdareportvalid.html
-share/doc/libgda/libgda-gdaselect.html
-share/doc/libgda/libgda-gdaserverprovider.html
-share/doc/libgda/libgda-gdatable.html
-share/doc/libgda/libgda-gdatransaction.html
-share/doc/libgda/libgda-gdaxmlconnection.html
-share/doc/libgda/libgda-gdaxmldatabase.html
-share/doc/libgda/libgda-gdaxmldocument.html
-share/doc/libgda/libgda-gdaxqlatom.html
-share/doc/libgda/libgda-gdaxqlbin.html
-share/doc/libgda/libgda-gdaxqlcolumn.html
-share/doc/libgda/libgda-gdaxqlconst.html
-share/doc/libgda/libgda-gdaxqldelete.html
-share/doc/libgda/libgda-gdaxqldml.html
-share/doc/libgda/libgda-gdaxqldual.html
-share/doc/libgda/libgda-gdaxqlfield.html
-share/doc/libgda/libgda-gdaxqlfunc.html
-share/doc/libgda/libgda-gdaxqlinsert.html
-share/doc/libgda/libgda-gdaxqlitem.html
-share/doc/libgda/libgda-gdaxqljoin.html
-share/doc/libgda/libgda-gdaxqllist.html
-share/doc/libgda/libgda-gdaxqlquery.html
-share/doc/libgda/libgda-gdaxqlselect.html
-share/doc/libgda/libgda-gdaxqlstack.html
-share/doc/libgda/libgda-gdaxqltarget.html
-share/doc/libgda/libgda-gdaxqlupdate.html
-share/doc/libgda/libgda-gdaxqlvalue.html
-share/doc/libgda/libgda-gdaxqlvalueref.html
-share/doc/libgda/libgda-libgda.html
-share/doc/libgda/libgda-provider-class.html
-share/doc/libgda/libgda-provider-recordset.html
-share/doc/libgda/libgda-providers.html
-share/doc/libgda/libgda-reports.html
-share/doc/libgda/libgda-xql.html
-share/doc/libgda/main_example.html
-share/doc/libgda/managing-errors.html
-share/doc/libgda/migration-configuration.html
-share/doc/libgda/migration-executing-commands.html
-share/doc/libgda/migration.html
-share/doc/libgda/processing-queries.html
-share/doc/libgda/x853.html
-share/doc/libgda/x863.html
-share/doc/libgda/x882.html
-share/doc/libgda/x887.html
-share/doc/libgda/x892.html
-share/doc/libgda/x897.html
+%%DOCSDIR%%/architecture.html
+%%DOCSDIR%%/c689.html
+%%DOCSDIR%%/c694.html
+%%DOCSDIR%%/compiling.html
+%%DOCSDIR%%/connecting.html
+%%DOCSDIR%%/connections.html
+%%DOCSDIR%%/data-model.html
+%%DOCSDIR%%/fdl-section1.html
+%%DOCSDIR%%/fdl-section10.html
+%%DOCSDIR%%/fdl-section2.html
+%%DOCSDIR%%/fdl-section3.html
+%%DOCSDIR%%/fdl-section4.html
+%%DOCSDIR%%/fdl-section5.html
+%%DOCSDIR%%/fdl-section6.html
+%%DOCSDIR%%/fdl-section7.html
+%%DOCSDIR%%/fdl-section8.html
+%%DOCSDIR%%/fdl-section9.html
+%%DOCSDIR%%/fdl-using.html
+%%DOCSDIR%%/fdl.html
+%%DOCSDIR%%/gdavalue.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/installation-configuring.html
+%%DOCSDIR%%/installation-installing.html
+%%DOCSDIR%%/installation.html
+%%DOCSDIR%%/introduction.html
+%%DOCSDIR%%/libgda-api.html
+%%DOCSDIR%%/libgda-gda-command.html
+%%DOCSDIR%%/libgda-gda-config.html
+%%DOCSDIR%%/libgda-gda-field.html
+%%DOCSDIR%%/libgda-gda-log.html
+%%DOCSDIR%%/libgda-gda-parameter.html
+%%DOCSDIR%%/libgda-gda-quark-list.html
+%%DOCSDIR%%/libgda-gda-report-types.html
+%%DOCSDIR%%/libgda-gda-row.html
+%%DOCSDIR%%/libgda-gda-util.html
+%%DOCSDIR%%/libgda-gda-value.html
+%%DOCSDIR%%/libgda-gda-xql-utils.html
+%%DOCSDIR%%/libgda-gdabatch.html
+%%DOCSDIR%%/libgda-gdaclient.html
+%%DOCSDIR%%/libgda-gdaconnection.html
+%%DOCSDIR%%/libgda-gdadatamodel.html
+%%DOCSDIR%%/libgda-gdadatamodelarray.html
+%%DOCSDIR%%/libgda-gdadatamodelhash.html
+%%DOCSDIR%%/libgda-gdadatamodellist.html
+%%DOCSDIR%%/libgda-gdaerror.html
+%%DOCSDIR%%/libgda-gdaexport.html
+%%DOCSDIR%%/libgda-gdareportdocument.html
+%%DOCSDIR%%/libgda-gdareportitem.html
+%%DOCSDIR%%/libgda-gdareportitemdetail.html
+%%DOCSDIR%%/libgda-gdareportitemlabel.html
+%%DOCSDIR%%/libgda-gdareportitempagefooter.html
+%%DOCSDIR%%/libgda-gdareportitempageheader.html
+%%DOCSDIR%%/libgda-gdareportitemrepfield.html
+%%DOCSDIR%%/libgda-gdareportitemreport.html
+%%DOCSDIR%%/libgda-gdareportitemreportfooter.html
+%%DOCSDIR%%/libgda-gdareportitemreportheader.html
+%%DOCSDIR%%/libgda-gdareportitemsqlquery.html
+%%DOCSDIR%%/libgda-gdareportresult.html
+%%DOCSDIR%%/libgda-gdareportvalid.html
+%%DOCSDIR%%/libgda-gdaselect.html
+%%DOCSDIR%%/libgda-gdaserverprovider.html
+%%DOCSDIR%%/libgda-gdatable.html
+%%DOCSDIR%%/libgda-gdatransaction.html
+%%DOCSDIR%%/libgda-gdaxmlconnection.html
+%%DOCSDIR%%/libgda-gdaxmldatabase.html
+%%DOCSDIR%%/libgda-gdaxmldocument.html
+%%DOCSDIR%%/libgda-gdaxqlatom.html
+%%DOCSDIR%%/libgda-gdaxqlbin.html
+%%DOCSDIR%%/libgda-gdaxqlcolumn.html
+%%DOCSDIR%%/libgda-gdaxqlconst.html
+%%DOCSDIR%%/libgda-gdaxqldelete.html
+%%DOCSDIR%%/libgda-gdaxqldml.html
+%%DOCSDIR%%/libgda-gdaxqldual.html
+%%DOCSDIR%%/libgda-gdaxqlfield.html
+%%DOCSDIR%%/libgda-gdaxqlfunc.html
+%%DOCSDIR%%/libgda-gdaxqlinsert.html
+%%DOCSDIR%%/libgda-gdaxqlitem.html
+%%DOCSDIR%%/libgda-gdaxqljoin.html
+%%DOCSDIR%%/libgda-gdaxqllist.html
+%%DOCSDIR%%/libgda-gdaxqlquery.html
+%%DOCSDIR%%/libgda-gdaxqlselect.html
+%%DOCSDIR%%/libgda-gdaxqlstack.html
+%%DOCSDIR%%/libgda-gdaxqltarget.html
+%%DOCSDIR%%/libgda-gdaxqlupdate.html
+%%DOCSDIR%%/libgda-gdaxqlvalue.html
+%%DOCSDIR%%/libgda-gdaxqlvalueref.html
+%%DOCSDIR%%/libgda-libgda.html
+%%DOCSDIR%%/libgda-provider-class.html
+%%DOCSDIR%%/libgda-provider-recordset.html
+%%DOCSDIR%%/libgda-providers.html
+%%DOCSDIR%%/libgda-reports.html
+%%DOCSDIR%%/libgda-xql.html
+%%DOCSDIR%%/main_example.html
+%%DOCSDIR%%/managing-errors.html
+%%DOCSDIR%%/migration-configuration.html
+%%DOCSDIR%%/migration-executing-commands.html
+%%DOCSDIR%%/migration.html
+%%DOCSDIR%%/processing-queries.html
+%%DOCSDIR%%/x853.html
+%%DOCSDIR%%/x863.html
+%%DOCSDIR%%/x882.html
+%%DOCSDIR%%/x887.html
+%%DOCSDIR%%/x892.html
+%%DOCSDIR%%/x897.html
 share/gnome/libgda/xml/gda-report.dtd
 share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
 share/gnome/libgda/xml/gda-xml-query.xsl
 share/gnome/omf/libgda/libgda-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/libgda/libgda-C.omf 2>/dev/null || /usr/bin/true
 share/locale/az/LC_MESSAGES/libgda-2.mo
 share/locale/cs/LC_MESSAGES/libgda-2.mo
 share/locale/da/LC_MESSAGES/libgda-2.mo
@@ -236,3 +237,4 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
 @dirrm include/libgda
 @dirrm include/libgda-report
 @dirrm etc/libgda
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/libgda/libgda-C.omf 2>/dev/null || /usr/bin/true