2 files changed, 22 insertions, 23 deletions

diff --git a/net/sixxs-aiccu/Makefile b/net/sixxs-aiccu/Makefile
index e07ecc0cc110..281bdddccd6e 100644
--- a/net/sixxs-aiccu/Makefile
+++ b/net/sixxs-aiccu/Makefile
@@ -17,8 +17,6 @@ LIB_DEPENDS=	gnutls-openssl:${PORTSDIR}/security/gnutls
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-NO_STAGE=	yes
-
 USE_RC_SUBR=	sixxs-aiccu
 USE_GMAKE=	yes
 
@@ -29,6 +27,9 @@ WRKSRC=		${WRKDIR}/aiccu
 BUILD_WRKSRC=	${WRKDIR}/aiccu/unix-console
 PORTDOCS=	README
 
+OPTIONS_DEFINE=	LOG_DAEMON
+LOG_DAEMON_DESC=	log to LOG_DAEMON instead to LOG_LOCAL7
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's:verbose true:verbose false:' \
@@ -39,9 +40,9 @@ post-patch:
 		-e 's:ipv6_interface sixxs:ipv6_interface gif0:' \
 		${WRKSRC}/doc/aiccu.conf
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LOG_DAEMON)
+.if ${PORT_OPTIONS:MLOG_DAEMON}
 do-configure:
 	@${REINPLACE_CMD} \
 		-e 's:LOG_LOCAL7:LOG_DAEMON:' \
@@ -49,14 +50,11 @@ do-configure:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${PREFIX}/sbin/sixxs-aiccu
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR}
-.endif
-	${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${PREFIX}/etc/aiccu.conf.sample
-.if !exists(${PREFIX}/etc/aiccu.conf)
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/doc/aiccu.conf ${PREFIX}/etc/aiccu.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${STAGEDIR}${PREFIX}/sbin/sixxs-aiccu
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}/
 .endif
+	${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${STAGEDIR}${PREFIX}/etc/aiccu.conf.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/tinyldap/Makefile b/net/tinyldap/Makefile
index f7cb747871da..e4816943a7c7 100644
--- a/net/tinyldap/Makefile
+++ b/net/tinyldap/Makefile
@@ -14,15 +14,11 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/${LIBOWFAT_PORT}
 
 LICENSE=	GPLv2
 
-NO_STAGE=	yes
-
 SNAPSHOT=	20091122
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-DATTRIBS=512
-LIBOWFAT_PORT?=	devel/libowfat
-TINYLDAP_DATA?=	${PREFIX}/tinyldap/data
 SBINFILES=	acl addindex bindrequest dumpacls dumpidx idx2ldif parse \
 		tinyldap_debug tinyldap_standalone
 BINFILES=	ldapclient ldapclient_str md5password mysql2ldif \
@@ -30,24 +26,29 @@ BINFILES=	ldapclient ldapclient_str md5password mysql2ldif \
 DOCFILES=	ACL FORMAT GETTING.STARTED README README.security RFCs \
 		THANKS TODO
 
+LIBOWFAT_PORT?=	devel/libowfat
+TINYLDAP_DATA?=	${PREFIX}/tinyldap/data
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	${TOUCH} ${WRKSRC}/alloca.h
 	${REINPLACE_CMD} -e "s|\"data\"|\"${TINYLDAP_DATA}\"|" \
 		${WRKSRC}/tinyldap.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tinyldap ${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/tinyldap ${STAGEDIR}${PREFIX}/libexec/
 	${CP} -p ${WRKSRC}/ldapdelete ${WRKSRC}/tinyldapdelete
 .for i in ${BINFILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 .for i in ${SBINFILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif