pkgsrc-WIP-changes archive

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

openfortivpn: cleaning configure options



Module Name:	pkgsrc-wip
Committed By:	Francisco J. Tsao Santín <tsao%disroot.org@localhost>
Pushed By:	tsao
Date:		Fri Jul 22 00:53:05 2022 +0200
Changeset:	bb250ff2b4772d364cc79fb329736b001236d8bb

Modified Files:
	openfortivpn/Makefile
	openfortivpn/options.mk

Log Message:
openfortivpn: cleaning configure options

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

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

diffstat:
 openfortivpn/Makefile   |  8 --------
 openfortivpn/options.mk | 43 +------------------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diffs:
diff --git a/openfortivpn/Makefile b/openfortivpn/Makefile
index baf4fb85e0..985cad7bed 100644
--- a/openfortivpn/Makefile
+++ b/openfortivpn/Makefile
@@ -17,14 +17,6 @@ CONF_FILES+=		${PREFIX}/share/examples/${PKGNAME}/config ${PKG_SYSCONFDIR}/openf
 MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/openfortivpn \
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
-.include "../../mk/bsd.prefs.mk"
-
-NETSTAT_PATH?=		/usr/sbin/netstat
-PPP_PATH?=		/usr/sbin/pppd
-PPPD_PATH?=		/usr/sbin/pppd
-RESOLVCONF_PATH?=	/sbin/resolvconf
-SYSTEMDSYSTEMUNITDIR?=	/usr/lib/systemd/system
-
 .include "options.mk"
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/openfortivpn/options.mk b/openfortivpn/options.mk
index 9840b4c34f..be677f8790 100644
--- a/openfortivpn/options.mk
+++ b/openfortivpn/options.mk
@@ -1,56 +1,15 @@
 # $NetBSD: options.mk$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openfortivpn
-PKG_SUPPORTED_OPTIONS=	openfortivpn-proc
-PKG_SUPPORTED_OPTIONS+=	openfortivpn-enable-resolvconf
 PKG_SUPPORTED_OPTIONS+=	openfortivpn-obsolete
 PKG_SUPPORTED_OPTIONS+=	openfortivpn-rt-dst
-PKG_SUPPORTED_OPTIONS+=	openfortivpn-netstat
-PKG_SUPPORTED_OPTIONS+=	openfortivpn-pppd
-PKG_SUPPORTED_OPTIONS+=	openfortivpn-ppp
-PKG_SUPPORTED_OPTIONS+=	openfortivpn-with-resolvconf
-PKG_SUPPORTED_OPTIONS+=	openfortivpn-systemdsystemunitdir
 
 .include "../../mk/bsd.options.mk"
 
-# Package-specific option-handling
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-proc)
-CONFIGURE_ARGS+=	--enable-proc
-.else
-CONFIGURE_ARGS+=	--disable-proc
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-enable-resolvconf)
-CONFIGURE_ARGS+=	--enable-resolvconf
-.else
-CONFIGURE_ARGS+=	--disable-resolvconf
-.endif
-
 .if !empty(PKG_OPTIONS:Mopenfortivpn-obsolete)
 CONFIGURE_ARGS+=	--enable-obsolete
 .endif
 
-.if !empty(PKG_OPTIONS:Mopenfortivpn-rt-dst)
+.if !empty(PKG_OPTIONS:Mopenfortivpn-rt-dst) && ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--with-rt_dst
 .endif
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-netstat)
-CONFIGURE_ARGS+=	--with-netstat=${NETSTAT_PATH:Q}
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-pppd)
-CONFIGURE_ARGS+=	--with-pppd=${PPPD_PATH:Q}
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-ppp)
-CONFIGURE_ARGS+=	--with-ppp=${PPP_PATH:Q}
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-with-resolvconf)
-CONFIGURE_ARGS+=	--with-resolvconf=${RESOLVCONF_PATH:Q}
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenfortivpn-systemdsystemunitdir)
-CONFIGURE_ARGS+=	--with-systemdsystemunitdir=${SYSTEMDSYSTEMUNITDIR:Q}
-.endif


Home | Main Index | Thread Index | Old Index