Attachment #206138 for bug #239458




OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEV1 \
		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MEDIATION MYSQL PKI SCEP SMP \
		SQLITE SWANCTL TESTVECTOR TPM UNBOUND UNITY VICI XAUTH
OPTIONS_DEFINE_i386= VIA
OPTIONS_DEFAULT=	BUILTIN CURL IKEV1 PKI SWANCTL VICI
OPTIONS_SINGLE=	PRINTF_HOOKS
OPTIONS_SINGLE_PRINTF_HOOKS=	BUILTIN LIBC VSTR

BUILTIN_DESC=	Use builtin printf hooks
LIBC_DESC=	Use libc printf hooks
VSTR_DESC=	Use devel/vstr printf hooks
VIA_DESC=	Enable VIA Padlock support

# Extra options
CURL_CONFIGURE_ON=	--enable-curl

LIBC_CONFIGURE_ON=	--with-printf-hooks=glibc
VSTR_CONFIGURE_ON=	--with-printf-hooks=vstr
VSTR_LIB_DEPENDS=	libvstr.so:devel/vstr
VIA_CONFIGURE_ON=	--enable-padlock

.include <bsd.port.options.mk>


PLIST_SUB+=	XAUTHGEN="@comment "
.endif

# Hack to disable VIA in plist of unsupported architectures
.if ! ${OPTIONS_DEFINE:MVIA}
PLIST_SUB+=       VIA="@comment "
.else
.endif

post-install:
.if ${PORT_OPTIONS:MVICI}
	${INSTALL_DATA} ${WRKSRC}/src/libcharon/plugins/vici/libvici.h \

Lines 393-395 Link Here

(-)pkg-plist (+4 lines)
393	%%SWANCTL%%@dir etc/swanctl/x509ca	393	%%SWANCTL%%@dir etc/swanctl/x509ca
394	%%SWANCTL%%@dir etc/swanctl/x509crl	394	%%SWANCTL%%@dir etc/swanctl/x509crl
395	%%SWANCTL%%@dir etc/swanctl/x509ocsp	395	%%SWANCTL%%@dir etc/swanctl/x509ocsp
		396	%%VIA%%%%DATADIR%%/templates/config/plugins/padlock.conf
		397	%%VIA%%lib/ipsec/plugins/libstrongswan-padlock.la
		398	%%VIA%%lib/ipsec/plugins/libstrongswan-padlock.so
		399	%%VIA%%@sample %%ETCDIR%%.d/charon/padlock.conf.sample

Return to bug 239458

Lines 43-48 Link Here

(-)Makefile (+9 lines)
43	OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEV1 \	43	OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEV1 \
44	IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MEDIATION MYSQL PKI SCEP SMP \	44	IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MEDIATION MYSQL PKI SCEP SMP \
45	SQLITE SWANCTL TESTVECTOR TPM UNBOUND UNITY VICI XAUTH	45	SQLITE SWANCTL TESTVECTOR TPM UNBOUND UNITY VICI XAUTH
		46	OPTIONS_DEFINE_i386= VIA
46	OPTIONS_DEFAULT= BUILTIN CURL IKEV1 PKI SWANCTL VICI	47	OPTIONS_DEFAULT= BUILTIN CURL IKEV1 PKI SWANCTL VICI
47	OPTIONS_SINGLE= PRINTF_HOOKS	48	OPTIONS_SINGLE= PRINTF_HOOKS
48	OPTIONS_SINGLE_PRINTF_HOOKS= BUILTIN LIBC VSTR	49	OPTIONS_SINGLE_PRINTF_HOOKS= BUILTIN LIBC VSTR
Lines 73-78 Link Here
73	BUILTIN_DESC= Use builtin printf hooks	74	BUILTIN_DESC= Use builtin printf hooks
74	LIBC_DESC= Use libc printf hooks	75	LIBC_DESC= Use libc printf hooks
75	VSTR_DESC= Use devel/vstr printf hooks	76	VSTR_DESC= Use devel/vstr printf hooks
		77	VIA_DESC= Enable VIA Padlock support
76		78
77	# Extra options	79	# Extra options
78	CURL_CONFIGURE_ON= --enable-curl	80	CURL_CONFIGURE_ON= --enable-curl
Lines 114-119 Link Here
114	LIBC_CONFIGURE_ON= --with-printf-hooks=glibc	116	LIBC_CONFIGURE_ON= --with-printf-hooks=glibc
115	VSTR_CONFIGURE_ON= --with-printf-hooks=vstr	117	VSTR_CONFIGURE_ON= --with-printf-hooks=vstr
116	VSTR_LIB_DEPENDS= libvstr.so:devel/vstr	118	VSTR_LIB_DEPENDS= libvstr.so:devel/vstr
		119	VIA_CONFIGURE_ON= --enable-padlock
117		120
118	.include <bsd.port.options.mk>	121	.include <bsd.port.options.mk>
119		122
Lines 136-141 Link Here
136	PLIST_SUB+= XAUTHGEN="@comment "	139	PLIST_SUB+= XAUTHGEN="@comment "
137	.endif	140	.endif
138		141
		142	# Hack to disable VIA in plist of unsupported architectures
		143	.if ! ${OPTIONS_DEFINE:MVIA}
		144	PLIST_SUB+= VIA="@comment "
		145	.else
		146	.endif
		147
139	post-install:	148	post-install:
140	.if ${PORT_OPTIONS:MVICI}	149	.if ${PORT_OPTIONS:MVICI}
141	${INSTALL_DATA} ${WRKSRC}/src/libcharon/plugins/vici/libvici.h \	150	${INSTALL_DATA} ${WRKSRC}/src/libcharon/plugins/vici/libvici.h \