4 files changed, 51 insertions, 37 deletions

diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index 607a5ca45001..a1719709d55f 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -6,24 +6,18 @@ PORTVERSION=	1.1.0
 PORTREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	http://useperl.ru/ipager/src/
-DISTNAME=	ipager-${PORTVERSION}
 
-MAINTAINER=	lars.engels@0x20.net
+MAINTAINER=	lme@FreeBSD.org
 COMMENT=	X11 pager program
 
+LICENSE=	MIT
+
 USE_SCONS=	yes
 USE_EFL=	imlib2
 
-PLIST_FILES=	bin/ipager \
-		%%DATADIR%%/themes/atlantis.conf \
-		%%DATADIR%%/themes/dark_red.conf \
-		%%DATADIR%%/themes/green.conf \
-		%%DATADIR%%/themes/industrial.conf \
-		%%DATADIR%%/themes/light_gray.conf \
-		%%DATADIR%%/themes/light_orange.conf
-PLIST_DIRS=	%%DATADIR%%/themes %%DATADIR%%
-PORTDOCS=	ChangeLog LICENSE README ToDo
+SUB_FILES=	pkg-message
 
+DOCS=		ChangeLog README ToDo
 THEMES=		atlantis.conf \
 		dark_red.conf \
 		green.conf \
@@ -31,38 +25,25 @@ THEMES=		atlantis.conf \
 		light_gray.conf \
 		light_orange.conf
 
-NO_STAGE=	yes
-post-patch:
-		@${REINPLACE_CMD} -e '35,36d;89d;92,94d' \
-			${WRKSRC}/SConstruct
+SCONS_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
 
-do-build:
-	   @cd ${WRKSRC} && ${SCONS_BIN}
+post-patch:
+	@${REINPLACE_CMD} -e '35,36d;89d;92,94d' \
+		${WRKSRC}/SConstruct
 
-do-install:
-	   @cd ${WRKSRC} && ${SCONS_BIN} ${SCONS_INSTALL_TARGET}
+pre-build:
+	# scons is too stupid to create DESTDIR by itself
+	@${MKDIR} ${WRKDIR}/stage
 
 post-install:
-.if !defined (NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	${MKDIR} ${DATADIR}/themes
+	${MKDIR} ${STAGEDIR}${DATADIR}/themes
 .for t in ${THEMES}
-	${INSTALL_DATA} ${WRKSRC}/themes/${t} ${DATADIR}/themes
+	${INSTALL_DATA} ${WRKSRC}/themes/${t} ${STAGEDIR}${DATADIR}/themes
 .endfor
-	${STRIP_CMD} ${LOCALBASE}/bin/ipager
-
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "     Some additional themes (config files) you may find"
-	@${ECHO_MSG} "     in the ${DATADIR}/themes directory."
-	@${ECHO_MSG} "     Just copy any of them instead of your ~./ipager/ipager.conf"
-	@${ECHO_MSG} "     config file or you can define other config file via '-c'"
-	@${ECHO_MSG} "     command line option"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} ""
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ipager
 
 .include <bsd.port.mk>
diff --git a/x11/ipager/files/patch-ipager.cpp b/x11/ipager/files/patch-ipager.cpp
new file mode 100644
index 000000000000..e5073985fe62
--- /dev/null
+++ b/x11/ipager/files/patch-ipager.cpp
@@ -0,0 +1,10 @@
+--- ./ipager.cpp.orig	2013-10-02 17:32:19.537257981 +0200
++++ ./ipager.cpp	2013-10-02 17:32:46.295254941 +0200
+@@ -31,6 +31,7 @@
+ 
+ #include <iostream>
+ #include <string>
++#include <unistd.h>
+ using namespace std;
+ 
+ #include "pager.h"
diff --git a/x11/ipager/files/pkg-message.in b/x11/ipager/files/pkg-message.in
new file mode 100644
index 000000000000..b709a53fbd5f
--- /dev/null
+++ b/x11/ipager/files/pkg-message.in
@@ -0,0 +1,10 @@
+
+********************************************************************************
+
+Some additional themes (config files) you may find in the 
+${DATADIR}/themes directory. 
+Just copy any of them instead of your ~./ipager/ipager.conf config
+file or you can define other config file via '-c'" command line option.
+
+********************************************************************************
+
diff --git a/x11/ipager/pkg-plist b/x11/ipager/pkg-plist
new file mode 100644
index 000000000000..ed4cad43b20a
--- /dev/null
+++ b/x11/ipager/pkg-plist
@@ -0,0 +1,13 @@
+bin/ipager
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ToDo
+%%DATADIR%%/themes/atlantis.conf
+%%DATADIR%%/themes/dark_red.conf
+%%DATADIR%%/themes/green.conf
+%%DATADIR%%/themes/industrial.conf
+%%DATADIR%%/themes/light_gray.conf
+%%DATADIR%%/themes/light_orange.conf
+@dirrmtry %%DATADIR%%/themes
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%