diff --git a/net/l4ip/Makefile b/net/l4ip/Makefile index aec859c491d9..c15dffb40dee 100644 --- a/net/l4ip/Makefile +++ b/net/l4ip/Makefile @@ -14,19 +14,15 @@ COMMENT= L4 health check daemon for IPFILTER USES= gmake WRKSRC= ${WRKDIR}/${PORTNAME}/src -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's,service_type_t,script_type_t,g' ${WRKSRC}/service.c ${REINPLACE_CMD} -e 's,/usr/sbin,/sbin,g' ${WRKSRC}/l4ip.conf ${REINPLACE_CMD} -e '/^CC/d' ${WRKSRC}/${MAKEFILE} ${WRKSRC}/../lion/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/l4ip ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/l4ip.conf ${PREFIX}/etc/l4ip.conf.sample -.if !exists(${PREFIX}/etc/l4ip.conf) - ${CP} ${PREFIX}/etc/l4ip.conf.sample ${PREFIX}/etc/l4ip.conf -.endif - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL} ${WRKSRC}/../samples/*.conf ${EXAMPLESDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/l4ip ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/l4ip.conf ${STAGEDIR}${PREFIX}/etc/l4ip.conf.sample + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL} ${WRKSRC}/../samples/*.conf ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/net/l4ip/pkg-plist b/net/l4ip/pkg-plist index 665394d1f4c5..98678931a8eb 100644 --- a/net/l4ip/pkg-plist +++ b/net/l4ip/pkg-plist @@ -1,7 +1,5 @@ sbin/l4ip -@unexec if cmp -s %D/etc/l4ip.conf %D/etc/l4ip.conf.sample; then rm -f %D/etc/l4ip.conf; fi -etc/l4ip.conf.sample -@exec [ -f %B/l4ip.conf ] || cp %B/%f %B/l4ip.conf +@sample etc/l4ip.conf.sample %%EXAMPLESDIR%%/apache1.conf %%EXAMPLESDIR%%/apache2.conf %%EXAMPLESDIR%%/dns1.conf