pkgsrc-WIP-changes archive

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

neko: Add proper pkg options, add a TODO



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Thu Feb 13 19:43:10 2020 -0800
Changeset:	67c9c3ac0cc078cb3c25f71ad6883cc32a4e81a5

Modified Files:
	neko/Makefile
	neko/PLIST
Added Files:
	neko/TODO
	neko/options.mk

Log Message:
neko: Add proper pkg options, add a TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=67c9c3ac0cc078cb3c25f71ad6883cc32a4e81a5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 neko/Makefile   |  9 +------
 neko/PLIST      |  8 ++++++
 neko/TODO       |  1 +
 neko/options.mk | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 8 deletions(-)

diffs:
diff --git a/neko/Makefile b/neko/Makefile
index 3c8ac8b92d..90644c8f28 100644
--- a/neko/Makefile
+++ b/neko/Makefile
@@ -13,14 +13,7 @@ EXTRACT_USING=	gtar
 USE_LANGUAGES=	c
 USE_CMAKE=	yes
 
-# XXX Minimal configuration for now. Should use options.mk instead.
-CMAKE_ARGS+=	-DWITH_REGEXP:BOOL=OFF
-CMAKE_ARGS+=	-DWITH_UI:BOOL=OFF
-CMAKE_ARGS+=	-DWITH_SSL:BOOL=OFF
-CMAKE_ARGS+=	-DWITH_MYSQL:BOOL=OFF
-CMAKE_ARGS+=	-DWITH_SQLITE:BOOL=OFF
-CMAKE_ARGS+=	-DWITH_APACHE:BOOL=OFF
-CMAKE_ARGS+=	-DWITH_NEKOML:BOOL=OFF
+.include "options.mk"
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/neko/PLIST b/neko/PLIST
index 202d1cc9a8..fac8aa3cbd 100644
--- a/neko/PLIST
+++ b/neko/PLIST
@@ -13,5 +13,13 @@ lib/cmake/Neko/NekoTargets.cmake
 lib/libneko.so
 lib/libneko.so.2
 lib/libneko.so.2.3.0
+${PLIST.apache}lib/neko/mod_neko2.ndll
+${PLIST.apache}lib/neko/mod_tora2.ndll
+${PLIST.mysql}lib/neko/mysql.ndll
+${PLIST.mysql}lib/neko/mysql5.ndll
+${PLIST.regexp}lib/neko/regexp.ndll
+${PLIST.sqlite}lib/neko/sqlite.ndll
+${PLIST.ssl}lib/neko/ssl.ndll
 lib/neko/std.ndll
+${PLIST.ui}lib/neko/ui.ndll
 lib/neko/zlib.ndll
diff --git a/neko/TODO b/neko/TODO
new file mode 100644
index 0000000000..efdb0da2a7
--- /dev/null
+++ b/neko/TODO
@@ -0,0 +1 @@
+'nekoml' option does not work at build-time
diff --git a/neko/options.mk b/neko/options.mk
new file mode 100644
index 0000000000..7e1ee219ee
--- /dev/null
+++ b/neko/options.mk
@@ -0,0 +1,77 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.neko
+
+PKG_SUPPORTED_OPTIONS=	# defined
+PKG_SUPPORTED_OPTIONS+=	apache
+PKG_SUPPORTED_OPTIONS+=	mysql
+PKG_SUPPORTED_OPTIONS+=	nekoml
+PKG_SUPPORTED_OPTIONS+=	regexp
+PKG_SUPPORTED_OPTIONS+=	sqlite
+PKG_SUPPORTED_OPTIONS+=	ssl
+PKG_SUPPORTED_OPTIONS+=	ui
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	apache
+PLIST_VARS+=	mysql
+PLIST_VARS+=	nekoml
+PLIST_VARS+=	regexp
+PLIST_VARS+=	sqlite
+PLIST_VARS+=	ssl
+PLIST_VARS+=	ui
+
+.if !empty(PKG_OPTIONS:Mapache)
+CMAKE_ARGS+=	-DWITH_APACHE:BOOL=ON
+.include "../../www/apache24/buildlink3.mk"
+PLIST.apache=	yes
+.else
+CMAKE_ARGS+=	-DWITH_APACHE:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+CMAKE_ARGS+=	-DWITH_MYSQL:BOOL=ON
+.include "../../databases/mysql57-client/buildlink3.mk"
+PLIST.mysql=	yes
+.else
+CMAKE_ARGS+=	-DWITH_MYSQL:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mnekoml)
+CMAKE_ARGS+=	-DWITH_NEKOML:BOOL=ON
+PLIST.nekoml=	yes
+.else
+CMAKE_ARGS+=	-DWITH_NEKOML:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mregexp)
+CMAKE_ARGS+=	-DWITH_REGEXP:BOOL=ON
+.include "../../devel/pcre/buildlink3.mk"
+PLIST.regexp=	yes
+.else
+CMAKE_ARGS+=	-DWITH_REGEXP:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite)
+CMAKE_ARGS+=	-DWITH_SQLITE:BOOL=ON
+.include "../../databases/sqlite3/buildlink3.mk"
+PLIST.sqlite=	yes
+.else
+CMAKE_ARGS+=	-DWITH_SQLITE:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CMAKE_ARGS+=	-DWITH_SSL:BOOL=ON
+.include "../../security/mbedtls/buildlink3.mk"
+PLIST.ssl=	yes
+.else
+CMAKE_ARGS+=	-DWITH_SSL:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mui)
+CMAKE_ARGS+=	-DWITH_UI:BOOL=ON
+.include "../../x11/gtk2/buildlink3.mk"
+PLIST.ui=	yes
+.else
+CMAKE_ARGS+=	-DWITH_UI:BOOL=OFF
+.endif


Home | Main Index | Thread Index | Old Index