pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/SOPE5 devel/SOPE5: remove options and enable lda...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/96a7602e94c7
branches:  trunk
changeset: 372540:96a7602e94c7
user:      tm <tm%pkgsrc.org@localhost>
date:      Wed Jan 26 22:37:05 2022 +0000

description:
devel/SOPE5: remove options and enable ldap, mysql-client, pg-client

options.mk are not supported because gnustep-make/-base set
PKG_OPTIONS_VAR to support the fragile option. Additional to that
SOGo5 requires ldap option by default.

diffstat:

 devel/SOPE5/Makefile   |  14 +++++++++++---
 devel/SOPE5/options.mk |  38 --------------------------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diffs (70 lines):

diff -r e851fe815474 -r 96a7602e94c7 devel/SOPE5/Makefile
--- a/devel/SOPE5/Makefile      Wed Jan 26 21:19:09 2022 +0000
+++ b/devel/SOPE5/Makefile      Wed Jan 26 22:37:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/26 16:41:45 tm Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/26 22:37:05 tm Exp $
 #
 
 DISTNAME=      SOPE-5.5.0
@@ -18,8 +18,16 @@
 
 CONFIGURE_ARGS=        --with-gnustep --enable-debug --disable-strip
 
-.include "../../devel/gnustep-make/gnustep.mk"
-.include "options.mk"
+# options.mk are not supported because gnustep-make/-base set
+# PKG_OPTIONS_VAR to support the fragile option.
+.include "../../mk/mysql.buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
+
+pre-configure:
+       ${TEST} -e ${BUILDLINK_DIR}/lib/libmysqlclient.so || \
+       ${LN} -s ${BUILDLINK_DIR}/lib/mysql/libmysqlclient.so \
+       ${BUILDLINK_DIR}/lib/libmysqlclient.so
 
 .include "../../devel/gnustep-make/buildlink3.mk"
 .include "../../devel/gnustep-base/buildlink3.mk"
diff -r e851fe815474 -r 96a7602e94c7 devel/SOPE5/options.mk
--- a/devel/SOPE5/options.mk    Wed Jan 26 21:19:09 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2022/01/26 16:41:45 tm Exp $
-
-PKG_OPTIONS_VAR=                       PKG_OPTIONS.SOPE
-
-PKG_SUPPORTED_OPTIONS=                 ldap
-PKG_OPTIONS_REQUIRED_GROUPS=           database
-PKG_OPTIONS_GROUP.database=            mysql pgsql
-
-PKG_SUGGESTED_OPTIONS=                 ldap pgsql
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=                           pgsql mysql ldap
-
-.if !empty(PKG_OPTIONS:Mmysql)
-pre-configure:
-       ${TEST} -e ${BUILDLINK_DIR}/lib/libmysqlclient.so || \
-       ${LN} -s ${BUILDLINK_DIR}/lib/mysql/libmysqlclient.so \
-       ${BUILDLINK_DIR}/lib/libmysqlclient.so
-.include "../../mk/mysql.buildlink3.mk"
-PLIST.mysql=                           yes
-.else
-CONFIGURE_ARGS+=                       --disable-mysql
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-.include "../../mk/pgsql.buildlink3.mk"
-PLIST.pgsql=                           yes
-.else
-CONFIGURE_ARGS+=                       --disable-postgresql
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap-client/buildlink3.mk"
-PLIST.ldap=                            yes
-.else
-CONFIGURE_ARGS+=                       --disable-openldap
-.endif



Home | Main Index | Thread Index | Old Index