2 files changed, 60 insertions, 37 deletions

diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 629361a1bbab..769891c52139 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	i3
 DISTVERSION=	4.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/
 
@@ -12,15 +12,15 @@ COMMENT=	Improved dynamic tiling window manager
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libxcb-util.so:${PORTSDIR}/x11/xcb-util \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libev.so:${PORTSDIR}/devel/libev \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
+		xcb-util:${PORTSDIR}/x11/xcb-util \
+		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
+		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
+		ev:${PORTSDIR}/devel/libev \
+		yajl:${PORTSDIR}/devel/yajl \
+		cairo:${PORTSDIR}/graphics/cairo \
+		pangocairo:${PORTSDIR}/x11-toolkits/pango \
+		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
@@ -31,6 +31,33 @@ USE_BZIP2=	yes
 USE_PERL5=	run
 MAKE_JOBS_UNSAFE=	yes
 
+PLIST_FILES=	bin/i3 \
+		bin/i3-config-wizard \
+		bin/i3-dmenu-desktop \
+		bin/i3-dump-log \
+		bin/i3-input \
+		bin/i3-migrate-config-to-v4 \
+		bin/i3-msg \
+		bin/i3-nagbar \
+		bin/i3-sensible-editor \
+		bin/i3-sensible-pager \
+		bin/i3-sensible-terminal \
+		bin/i3bar \
+		etc/i3/config.sample \
+		etc/i3/config.keycodes \
+
+PLIST_DIRS=	etc/i3
+
+MANUALS=	i3-config-wizard.1 i3-dmenu-desktop.1 \
+		i3-dump-log.1 i3-input.1 \
+		i3-migrate-config-to-v4.1 i3-msg.1 \
+		i3-nagbar.1 i3-sensible-editor.1 \
+		i3-sensible-pager.1 i3-sensible-terminal.1 \
+		i3.1 i3bar.1
+
+MAN1=	${MANUALS}
+
+NO_STAGE=	yes
 post-extract:
 	@cd ${WRKSRC} && ${CP} i3.config config.sample
 	@cd ${WRKSRC} && ${CP} i3.config.keycodes config.keycodes
@@ -48,7 +75,28 @@ post-patch:
 			  -e 's|-liconv|${ICONV_LIB}|' \
 			  -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/common.mk
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+.for i in i3-config-wizard i3-dump-log i3-input i3-msg i3-nagbar i3bar
+	${INSTALL_SCRIPT} ${WRKSRC}/$i/$i ${PREFIX}/bin/
+.endfor
+.for i in i3-dmenu-desktop i3-sensible-editor i3-sensible-pager \
+	i3-sensible-terminal i3-migrate-config-to-v4
+	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/bin/
+.endfor
+	@${MKDIR} ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/config.keycodes ${PREFIX}/etc/${PORTNAME}
+.for i in ${MANUALS}
+	${INSTALL_MAN} ${WRKSRC}/man/${i} ${MANPREFIX}/man/man1/
+.endfor
+
+	@${ECHO_MSG} "======================================================================================"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	${PORTNAME} needs a config file! You can find an example in ${PREFIX}/etc/${PORTNAME}"
+	@${ECHO_MSG} "	Please rename it to ${PREFIX}/etc/${PORTNAME}/config"
+	@${ECHO_MSG} "	For more information read the manpage :)"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "======================================================================================"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/i3/pkg-plist b/x11-wm/i3/pkg-plist
deleted file mode 100644
index 8a5a04d6bba7..000000000000
--- a/x11-wm/i3/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-bin/i3
-bin/i3-config-wizard
-bin/i3-dmenu-desktop
-bin/i3-dump-log
-bin/i3-input
-bin/i3-migrate-config-to-v4
-bin/i3-msg
-bin/i3-nagbar
-bin/i3-sensible-editor
-bin/i3-sensible-pager
-bin/i3-sensible-terminal
-bin/i3bar
-%%ETCDIR%%/config.sample
-%%ETCDIR%%/config.keycodes
-man/man1/i3-dump-log.1.gz
-man/man1/i3-input.1.gz
-man/man1/i3-migrate-config-to-v4.1.gz
-man/man1/i3-msg.1.gz
-man/man1/i3-nagbar.1.gz
-man/man1/i3-sensible-editor.1.gz
-man/man1/i3-sensible-pager.1.gz
-man/man1/i3-sensible-terminal.1.gz
-man/man1/i3.1.gz
-man/man1/i3bar.1.gz
-@dirrmtry %%ETCDIR%%