enable stage.

2 files changed, 27 insertions, 44 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 0ca2a62194b3..9869e29cc7e6 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	A GTK based system monitor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES+=		gmake pkgconfig
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_RC_SUBR=	gkrellmd
 WANT_GNOME=	yes
@@ -25,7 +25,6 @@ OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	GKRELLM_CLIENT NTLM OPENSSL
 GKRELLM_CLIENT_DESC=	GKrellM Client
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGKRELLM_CLIENT}
@@ -38,7 +37,7 @@ MAKE_ENV+=	enable_nls=0
 .endif
 USE_XORG=	x11 sm
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls-openssl:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls-openssl.so:${PORTSDIR}/security/gnutls
 MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
 		without-ssl=1
 .elif ${PORT_OPTIONS:MOPENSSL}
@@ -54,7 +53,7 @@ USE_GNOME=	glib20
 .endif
 
 .if ${PORT_OPTIONS:MNTLM}
-LIB_DEPENDS+=	ntlm:${PORTSDIR}/security/libntlm
+LIB_DEPENDS+=	libntlm.so:${PORTSDIR}/security/libntlm
 .else
 MAKE_ENV+=	without-ntlm=1
 .endif
@@ -67,11 +66,9 @@ PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
-#MAN1=		gkrellm.1
 .else
 PLIST_SUB+=	CLIENT="@comment " NLS="@comment "
 .endif
-MAN8=		gkrellmd.8
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	COPYRIGHT CREDITS README Themes.html
@@ -79,11 +76,11 @@ PORTDOCS=	COPYRIGHT CREDITS README Themes.html
 
 ALL_TARGET=	freebsd
 
-MAKE_ENV+=	INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \
-		PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \
-		SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \
-		SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
-		MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \
+MAKE_ENV+=	INSTALLROOT=${STAGEDIR}${PREFIX} \
+		PKGCONFIGDIR=${STAGEDIR}${PREFIX}/libdata/pkgconfig \
+		SINSTALLDIR=${STAGEDIR}${PREFIX}/sbin \
+		MANDIR=${STAGEDIR}${MAN1PREFIX}/man/man1 \
+		SMANDIR=${STAGEDIR}${MANPREFIX}/man/man8 \
 		VERSION=${PORTVERSION}
 
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \
@@ -92,31 +89,22 @@ CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \
 		-DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"'
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/INCLUDEDIR/SINCLUDEDIR/g' \
-			  -e 's/INSTALLROOT/SINSTALLROOT/g' \
-			  -e 's/PKGCONFIGDIR/SPKGCONFIGDIR/g' \
-			  ${WRKSRC}/server/Makefile
 	@${REINPLACE_CMD} -e 's/gthread-2.0/gmodule-2.0 gthread-2.0/g' \
 			  ${WRKSRC}/src/Makefile
 
 post-install:
 .if ${PORT_OPTIONS:MGKRELLM_CLIENT}
-	@${MKDIR} ${LOCALBASE}/libexec/gkrellm2/plugins
-	@${MKDIR} ${LOCALBASE}/share/gkrellm2/themes
-	@${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/gkrellm2/plugins
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/gkrellm2/themes
 .endif
-	@${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \
-		${EXAMPLESDIR}/gkrellmd.conf
-	if [ ! -f ${PREFIX}/etc/gkrellmd.conf ]; then \
-		${CP} -p ${EXAMPLESDIR}/gkrellmd.conf \
-			${PREFIX}/etc/gkrellmd.conf; \
-	fi
+		${STAGEDIR}${EXAMPLESDIR}/gkrellmd.conf
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 1eab7bc813fc..861f0c8f4f2a 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -1,22 +1,16 @@
+%%CLIENT%%bin/gkrellm
+%%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
+%%CLIENT%%include/gkrellm2/gkrellm.h
 include/gkrellm2/gkrellmd.h
 include/gkrellm2/log.h
-@dirrmtry include/gkrellm2
+%%CLIENT%%libdata/pkgconfig/gkrellm.pc
 libdata/pkgconfig/gkrellmd.pc
+%%CLIENT%%man/man1/gkrellm.1.gz
+man/man8/gkrellmd.8.gz
 sbin/gkrellmd
-@exec mkdir -p %D/libexec/gkrellm2/plugins-gkrellmd
-@dirrmtry libexec/gkrellm2/plugins-gkrellmd
-@dirrmtry libexec/gkrellm2
 @unexec if cmp -s %D/etc/gkrellmd.conf %D/%%EXAMPLESDIR%%/gkrellmd.conf; then rm -f %D/etc/gkrellmd.conf; fi
 %%EXAMPLESDIR%%/gkrellmd.conf
 @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf
-@dirrm %%EXAMPLESDIR%%
-%%CLIENT%%include/gkrellm2/gkrellm.h
-%%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
-%%CLIENT%%@dirrm include/gkrellm2
-%%CLIENT%%man/man1/gkrellm.1.gz
-%%CLIENT%%@unexec rm -f %D/man/cat1/gkrellm.1 %D/man/cat1/gkrellm.1.gz
-%%CLIENT%%bin/gkrellm
-%%CLIENT%%libdata/pkgconfig/gkrellm.pc
 %%NLS%%share/locale/bg/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gkrellm.mo
@@ -31,9 +25,10 @@ sbin/gkrellmd
 %%NLS%%share/locale/ru/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo
-%%CLIENT%%@exec mkdir -p %D/libexec/gkrellm2/plugins
-%%CLIENT%%@exec mkdir -p %D/share/gkrellm2/themes
+%%CLIENT%%@dirrmtry %%DATADIR%%2/themes
+%%CLIENT%%@dirrmtry %%DATADIR%%2
+@dirrm %%EXAMPLESDIR%%
+@dirrmtry libexec/gkrellm2/plugins-gkrellmd
 %%CLIENT%%@dirrmtry libexec/gkrellm2/plugins
-%%CLIENT%%@dirrmtry libexec/gkrellm2
-%%CLIENT%%@dirrmtry share/gkrellm2/themes
-%%CLIENT%%@dirrmtry share/gkrellm2
+@dirrmtry libexec/gkrellm2
+@dirrm include/gkrellm2