pkgsrc-WIP-changes archive

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

Added options for ssl, inotify, xinerama, and hal.



Module Name:	pkgsrc-wip
Committed By:	Dave Vollenweider <dvollen%gmail.com@localhost>
Pushed By:	dvol
Date:		Sun Oct 22 17:53:58 2023 +0000
Changeset:	6e1385c5faee649188477825712578d0ae0b8307

Modified Files:
	worker/Makefile
	worker/TODO
	worker/options.mk

Log Message:
Added options for ssl, inotify, xinerama, and hal.

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

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

diffstat:
 worker/Makefile   |  6 +++---
 worker/TODO       |  3 ++-
 worker/options.mk | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)

diffs:
diff --git a/worker/Makefile b/worker/Makefile
index b74a120548..1dc194c2be 100644
--- a/worker/Makefile
+++ b/worker/Makefile
@@ -15,16 +15,16 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	pkg-config
+#PKGCONFIG_OVERRIDE+=	pkgconfig/worker.pc.in
 
 REPLACE_BASH+=		scripts/*.sh scripts/*r
 REPLACE_PYTHON+=	scripts/*.py
 USE_TOOLS+=		bash:run
 
-# Should this be an option instead?
-.include "../../x11/libXft/buildlink3.mk"
+.include "options.mk"
+
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/worker/TODO b/worker/TODO
index 971cd66210..b5c36eb739 100644
--- a/worker/TODO
+++ b/worker/TODO
@@ -1 +1,2 @@
-- Possibly split into options.
\ No newline at end of file
+- Test the build with the options I've added, aside from Xft and Lua
+- Import AVFS and make it ready for pkgsrc
\ No newline at end of file
diff --git a/worker/options.mk b/worker/options.mk
index e69de29bb2..8f2f2294ff 100644
--- a/worker/options.mk
+++ b/worker/options.mk
@@ -0,0 +1,42 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.worker
+PKG_SUPPORTED_OPTIONS=		xft2 lua hal xinerama ssl inotify
+PKG_SUGGESTED_OPTIONS=		xft2 xinerama
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mxft2)
+CONFIGURE_ARGS+=	--enable-xft
+.include	"../../x11/libXft/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-xft
+.endif
+
+.if !empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+=	--enable-lua
+.include	"../../lang/lua/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-lua
+.endif
+
+.if !empty(PKG_OPTIONS:Mhal)
+.include	"../../sysutils/hal/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxinerama)
+.include	"../../x11/libXinerama/buildlink3.mk"
+.endif
+
+# Used for file checksum support
+.if !empty(PKG_OPTIONS:Mssl)
+.include	"../../security/openssl/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Minotify)
+CONFIGURE_ARGS+=	--enable-inotify
+if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
+.include	"../../devel/libinotify/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-inotify
+.endif


Home | Main Index | Thread Index | Old Index