- use STAGEDIR

- use OPTIONS_DEFINE

5 files changed, 40 insertions, 60 deletions

diff --git a/net-im/licq-icq/Makefile b/net-im/licq-icq/Makefile
index 31c7471db0eb..d307192d2637 100644
--- a/net-im/licq-icq/Makefile
+++ b/net-im/licq-icq/Makefile
@@ -21,15 +21,14 @@ PLIST_DIRS=	%%PORTDOCS%%%%DOCSDIR%%
 
 LICQ_PORT?=	net-im/licq
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/licq-jabber/Makefile b/net-im/licq-jabber/Makefile
index 3ea74799f13b..a34fa29080dd 100644
--- a/net-im/licq-jabber/Makefile
+++ b/net-im/licq-jabber/Makefile
@@ -12,8 +12,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libgloox.so:${PORTSDIR}/net-im/gloox \
 		libboost_regex.so:${PORTSDIR}/devel/boost-libs
 
-NO_STAGE=	yes
-
 USES=		cmake
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
@@ -24,14 +22,14 @@ PLIST_DIRS=	%%PORTDOCS%%%%DOCSDIR%%
 
 LICQ_PORT?=	net-im/licq
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/licq-msn/Makefile b/net-im/licq-msn/Makefile
index 1a1cc20a5406..7149b216df7b 100644
--- a/net-im/licq-msn/Makefile
+++ b/net-im/licq-msn/Makefile
@@ -11,8 +11,6 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
 
-NO_STAGE=	yes
-
 USES=		cmake
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
@@ -23,14 +21,14 @@ PLIST_DIRS=	%%PORTDOCS%%%%DOCSDIR%%
 
 LICQ_PORT?=	net-im/licq
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 9d4c1b743051..7638505abcf2 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -14,13 +14,20 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/lib/licq/protocol_icq.so:${PORTSDIR}/${LICQ_PORT}-icq
 
-NO_STAGE=	yes
-
 USE_XORG=	x11 xext ice xscrnsaver
 USES=		cmake
 USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build
 
-.if defined(WITH_KDE)
+OPTIONS_DEFINE=	KDE4
+OPTIONS_DEFAULT=
+
+LICQ_PORT?=	net-im/licq
+
+.include <bsd.port.options.mk>
+
+.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
+
+.if ${PORT_OPTIONS:MKDE4}
 KDE_SUFFIX=	-kde
 USE_KDE4=	kdelibs automoc4
 CMAKE_ARGS+=	-DWITH_KDE:BOOL=ON
@@ -34,21 +41,4 @@ PLIST_SUB+=	WITH_KDE="@comment "
 PLIST_SUB+=	WITH_QT=""
 .endif
 
-LICQ_PORT?=	net-im/licq
-
-pre-fetch:
-.if defined(WITH_KDE)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Build with KDE support"
-	@${ECHO_MSG} ""
-.else
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You could define WITH_KDE if you want KDE support"
-	@${ECHO_MSG} ""
-.endif
-
-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 8af8ce5747f1..d8e627e34f0e 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -10,12 +10,10 @@ PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A popular ICQ-compatible plugin-based program
 
-LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
 
 LICENSE=	GPLv2
 
-NO_STAGE=	yes
-
 USES=		cmake iconv
 WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	net-im/licq
@@ -26,20 +24,22 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-Wl,--export-dynamic
 
-.if !defined(WITHOUT_OPENSSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl-inc=${OPENSSLINC}
-CONFIGURE_ARGS+=--with-openssl-lib=${OPENSSLLIB}
-.endif
+OPTIONS_DEFINE=	OPENSSL
+OPTIONS_DEFAULT=OPENSSL
+
+OPENSSL_USE=	OPENSSL=yes
+OPENSSL_CONFIGURE_ON=	--with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB}
 
 .include <bsd.port.options.mk>
 
+.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
+
 .if ${PORT_OPTIONS:MNLS}
-CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
-PLIST_SUB+=	NLS="@comment "
-.else
 USES+=		gettext
 PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 pre-configure:
@@ -47,12 +47,7 @@ pre-configure:
 		${WRKSRC}/bin/sidclean.sh
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/licq
-	@${CAT} ${PKGMESSAGE}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${PREFIX}/bin/sidclean.bash
-
-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/licq
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${STAGEDIR}${PREFIX}/bin/sidclean.bash
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>