ports/121688: [patch] editors/koffice-kde3: several depencancy fixes

[Scot Hetzel]

>Number:         121688
>Category:       ports
>Synopsis:       [patch] editors/koffice-kde3: several depencancy fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 14 05:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Scot Hetzel
>Release:        FreeBSD 8.0-CURRENT
>Organization:
>Environment:
FreeBSD hp010 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sat Feb 16 06:42:46 CST 2008     root at hp010:/usr/src/sys/amd64/compile/DV8135NR  amd64

>Description:
Currently, koffice has dependencies on both MySQL and PostgreSQL. The attached patch makes it so that koffice can be built without one or both *SQL ports.
>How-To-Repeat:
install the port and check it's dependancies.
>Fix:
The attached patch fixes these dependency problems.

Patch attached with submission follows:

Index: editors/koffice-kde3/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/koffice-kde3/Makefile,v
retrieving revision 1.106
diff -u -r1.106 Makefile
--- editors/koffice-kde3/Makefile	8 Nov 2007 17:19:53 -0000	1.106
+++ editors/koffice-kde3/Makefile	10 Nov 2007 05:52:48 -0000
@@ -17,7 +17,9 @@
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Office Suite for KDE3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
+.if !defined(WITHOUT_PGSQL)
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTDIR}/databases/postgresql-libpqxx
+.endif
 LIB_DEPENDS=	GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		aspell:${PORTSDIR}/textproc/aspell \
@@ -31,7 +33,9 @@
 		wv2:${PORTSDIR}/textproc/wv2 \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		xslt:${PORTSDIR}/textproc/libxslt
+.if !defined(WITHOUT_PGSQL)
 RUN_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
+.endif
 
 USE_AUTOTOOLS=  libtool:15
 USE_LDCONFIG=	yes
@@ -39,18 +43,32 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
+.if !defined(WITHOUT_MYSQL)
 USE_MYSQL=	yes
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@coment "
+CONFIGURE_ARGS+=--disable-mysql
+.endif
 USE_PYTHON=	yes
 USE_RUBY=	yes
+.if !defined(WITHOUT_PGSQL)
 USE_PGSQL=	yes
+PLIST_SUB+=	PGSQL=""
+.else
+PLIST_SUB+=	PGSQL="@comment "
+CONFIGURE_ARGS+=--disable-pgsql
+.endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_PGSQL)
 CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \
 		--with-pgsqllibdir=${LOCALBASE}/lib \
 		--with-pqxx-includes=${LOCALBASE}/include \
 		--with-pqxx-libraries=${LOCALBASE}/lib
+.endif
 
 .if ${OSVERSION} < 500035
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
Index: editors/koffice-kde3/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/editors/koffice-kde3/pkg-plist,v
retrieving revision 1.32
diff -u -r1.32 pkg-plist
--- editors/koffice-kde3/pkg-plist	4 Jul 2007 10:24:11 -0000	1.32
+++ editors/koffice-kde3/pkg-plist	4 Jul 2007 21:47:58 -0000
@@ -355,12 +355,12 @@
 lib/kde3/kexi.a
 lib/kde3/kexi.la
 lib/kde3/kexi.so
-lib/kde3/kexidb_mysqldriver.a
-lib/kde3/kexidb_mysqldriver.la
-lib/kde3/kexidb_mysqldriver.so
-lib/kde3/kexidb_pqxxsqldriver.a
-lib/kde3/kexidb_pqxxsqldriver.la
-lib/kde3/kexidb_pqxxsqldriver.so
+%%MYSQL%%lib/kde3/kexidb_mysqldriver.a
+%%MYSQL%%lib/kde3/kexidb_mysqldriver.la
+%%MYSQL%%lib/kde3/kexidb_mysqldriver.so
+%%PGSQL%%lib/kde3/kexidb_pqxxsqldriver.a
+%%PGSQL%%lib/kde3/kexidb_pqxxsqldriver.la
+%%PGSQL%%lib/kde3/kexidb_pqxxsqldriver.so
 lib/kde3/kexidb_sqlite2driver.a
 lib/kde3/kexidb_sqlite2driver.la
 lib/kde3/kexidb_sqlite2driver.so
@@ -388,12 +388,12 @@
 lib/kde3/kexihandler_table.a
 lib/kde3/kexihandler_table.la
 lib/kde3/kexihandler_table.so
-lib/kde3/keximigrate_mysql.a
-lib/kde3/keximigrate_mysql.la
-lib/kde3/keximigrate_mysql.so
-lib/kde3/keximigrate_pqxx.a
-lib/kde3/keximigrate_pqxx.la
-lib/kde3/keximigrate_pqxx.so
+%%MYSQL%%lib/kde3/keximigrate_mysql.a
+%%MYSQL%%lib/kde3/keximigrate_mysql.la
+%%MYSQL%%lib/kde3/keximigrate_mysql.so
+%%PGSQL%%lib/kde3/keximigrate_pqxx.a
+%%PGSQL%%lib/kde3/keximigrate_pqxx.la
+%%PGSQL%%lib/kde3/keximigrate_pqxx.so
 lib/kde3/kfile_abiword.a
 lib/kde3/kfile_abiword.la
 lib/kde3/kfile_abiword.so
@@ -5288,12 +5288,12 @@
 share/services/kexi/kexirelationhandler.desktop
 share/services/kexi/kexiscripthandler.desktop
 share/services/kexi/kexitablehandler.desktop
-share/services/kexidb_mysqldriver.desktop
-share/services/kexidb_pqxxsqldriver.desktop
+%%MYSQL%%share/services/kexidb_mysqldriver.desktop
+%%PGSQL%%share/services/kexidb_pqxxsqldriver.desktop
 share/services/kexidb_sqlite2driver.desktop
 share/services/kexidb_sqlite3driver.desktop
-share/services/keximigrate_mysql.desktop
-share/services/keximigrate_pqxx.desktop
+%%MYSQL%%share/services/keximigrate_mysql.desktop
+%%PGSQL%%share/services/keximigrate_pqxx.desktop
 share/services/kfile_abiword.desktop
 share/services/kfile_gnumeric.desktop
 share/services/kfile_koffice.desktop


>Release-Note:
>Audit-Trail:
>Unformatted: