Add support for STAGEDIR

5 files changed, 14 insertions, 26 deletions

diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile
index 3aadeec2fa40..cc1fe75c29e1 100644
--- a/polish/ekg/Makefile
+++ b/polish/ekg/Makefile
@@ -25,10 +25,6 @@ CONFIGURE_ARGS= --without-libungif \
 CFLAGS+=	-I/usr/include -I${LOCALBASE}/include
 LDFLAGS+=	-L/usr/lib -lncurses -L${LOCALBASE}/lib -lexecinfo -pthread
 
-MAN1=		ekg.1
-MANLANG=	"" pl
-MANCOMPRESSED=	no
-
 OPTIONS_DEFINE=		ASPELL OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
 
@@ -37,8 +33,7 @@ ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/polish/aspell
 
 OPENSSL_CONFIGURE_OFF=	--without-openssl
 
-NO_STAGE=	yes
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/ekg
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ekg
 
 .include <bsd.port.mk>
diff --git a/polish/ekg/pkg-plist b/polish/ekg/pkg-plist
index d95115eeb9e5..d2e11bead048 100644
--- a/polish/ekg/pkg-plist
+++ b/polish/ekg/pkg-plist
@@ -1,4 +1,6 @@
 bin/ekg
+man/man1/ekg.1.gz
+man/pl/man1/ekg.1.gz
 %%DATADIR%%/themes/arim.theme
 %%DATADIR%%/themes/dj.theme
 %%DATADIR%%/themes/eileen.theme
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 4b65dab87bfc..89edf53289ab 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -87,7 +87,6 @@ XOSD_CONFIGURE_ON=	--with-libxosd
 XOSD_CONFIGURE_OFF=	--without-libxosd
 XOSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 52516add3e6f..936c7e974a95 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -16,18 +16,14 @@ RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
 
 USE_QT4=	corelib gui network xml qmake_build moc_build uic_build rcc_build
 USE_KDE4=	kdehier
-QMAKE_ARGS=	PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX}
+PLIST_SUB=	KDE4=${KDE4_PREFIX:S|${LOCALBASE}/||}
+QMAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX} KDE4_PREFIX=${STAGEDIR}${KDE4_PREFIX}
 INSTALLS_ICONS=	yes
 
-MAN1=		qnapi.1
-MANCOMPRESSED=	yes
 PORTDOCS=	ChangeLog README.pl COPYRIGHT
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/share/icons/||g' \
 		${WRKSRC}/doc/qnapi.desktop \
@@ -38,11 +34,7 @@ pre-build:
 	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|g} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/polish/qnapi/pkg-plist b/polish/qnapi/pkg-plist
index 54016f01c188..fa637fbd4650 100644
--- a/polish/qnapi/pkg-plist
+++ b/polish/qnapi/pkg-plist
@@ -1,14 +1,14 @@
 bin/qnapi
-share/icons/qnapi.png
-share/icons/qnapi-48.png
-share/icons/qnapi-128.png
-share/icons/qnapi-512.png
+%%KDE4%%/share/kde4/services/ServiceMenus/qnapi-download.desktop
+man/man1/qnapi.1.gz
 share/applications/qnapi.desktop
 share/apps/konqueror/servicemenus/qnapi-download.desktop
+share/icons/qnapi-128.png
+share/icons/qnapi-48.png
+share/icons/qnapi-512.png
+share/icons/qnapi.png
+@dirrmtry share/icons
 @dirrmtry share/apps/konqueror/servicemenus
 @dirrmtry share/apps/konqueror
 @dirrmtry share/apps
 @dirrmtry share/applications
-@dirrmtry share/icons
-@cwd %%KDE4_PREFIX%%
-share/kde4/services/ServiceMenus/qnapi-download.desktop