41 files changed, 206 insertions, 156 deletions

diff --git a/x11/evilvte/Makefile b/x11/evilvte/Makefile
index 6c61e7e71228..d68f2754bb2b 100644
--- a/x11/evilvte/Makefile
+++ b/x11/evilvte/Makefile
@@ -11,16 +11,12 @@ MASTER_SITES=	http://www.calno.com/${PORTNAME}/ \
 MAINTAINER=	aragon@phat.za.net
 COMMENT=	A VTE based, super lightweight terminal emulator
 
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_XZ=		yes
-USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	evilvte
 USE_GNOME=	vte
 
-MAN1=		evilvte.1 showvte.1
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
@@ -47,7 +43,7 @@ post-patch:
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/misc/evilvte.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/misc/showvte.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/misc/evilvte.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/misc/showvte.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/x11/evilvte/pkg-plist b/x11/evilvte/pkg-plist
index 7d352a2f57bc..b9e35401bad7 100644
--- a/x11/evilvte/pkg-plist
+++ b/x11/evilvte/pkg-plist
@@ -1,7 +1,9 @@
 bin/evilvte
 bin/showvte
+man/man1/evilvte.1.gz
+man/man1/showvte.1.gz
 share/applications/evilvte.desktop
-share/pixmaps/evilvte.png
+share/gnome-control-center/default-apps/evilvte.xml
 share/icons/hicolor/16x16/apps/evilvte.png
 share/icons/hicolor/20x20/apps/evilvte.png
 share/icons/hicolor/22x22/apps/evilvte.png
@@ -14,12 +16,32 @@ share/icons/hicolor/64x64/apps/evilvte.png
 share/icons/hicolor/72x72/apps/evilvte.png
 share/icons/hicolor/96x96/apps/evilvte.png
 share/icons/hicolor/scalable/apps/evilvte.svg
-share/gnome-control-center/default-apps/evilvte.xml
-@dirrmtry share/pixmaps
-@dirrmtry share/icons/hicolor/20x20/apps
-@dirrmtry share/icons/hicolor/20x20
+share/pixmaps/evilvte.png
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/40x40/apps
 @dirrmtry share/icons/hicolor/40x40
+@dirrmtry share/icons/hicolor/36x36/apps
+@dirrmtry share/icons/hicolor/36x36
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/20x20/apps
+@dirrmtry share/icons/hicolor/20x20
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/gnome-control-center/default-apps
+@dirrmtry share/gnome-control-center
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index c96a9bd24f6b..a87e5001a3b6 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -23,22 +23,21 @@ PLIST_DIRS=	%%DATADIR%%/pixmaps %%DATADIR%%
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=""||g' ${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/gtkterm2 ${PREFIX}/bin/gtkterm2
+	${INSTALL_PROGRAM} ${WRKSRC}/src/gtkterm2 ${STAGEDIR}${PREFIX}/bin/gtkterm2
 	${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
-		${PREFIX}/share/locale/de/LC_MESSAGES/gtkterm2.mo
-	@${MKDIR} ${DATADIR}/pixmaps
+		${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/gtkterm2.mo
+	@${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/gtkterm2.png \
-		${DATADIR}/pixmaps/gtkterm2.png
+		${STAGEDIR}${DATADIR}/pixmaps/gtkterm2.png
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index ff5eac45ca37..3c18b0e86fac 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -14,5 +14,4 @@ PLIST_FILES=	bin/kb2mb2
 USES=		imake
 USE_XORG=	x11 xext xtst
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 5bd5dd6ebd23..306966eb683c 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -14,10 +14,9 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_XORG=	x11 xext xrender
-USES=		pkgconfig pathfix
+USES=		gmake pkgconfig pathfix
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PYTHON LUA
@@ -26,7 +25,6 @@ OPTIONS_DEFAULT=	PYTHON
 # Override LUA description
 LUA_DESC=	Lua bindings
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
@@ -61,8 +59,8 @@ PLIST_SUB+=	DOCS="@comment "
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${REINPLACE_CMD} -i '' -e 's|lua5.1|lua-5.1|g' ${WRKSRC}/examples/Makefile
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/keybinder/pkg-plist b/x11/keybinder/pkg-plist
index bf72fe8aeb62..1dcc5ebe93fb 100644
--- a/x11/keybinder/pkg-plist
+++ b/x11/keybinder/pkg-plist
@@ -29,7 +29,6 @@ share/gir-1.0/Keybinder-0.0.gir
 %%DOCS%%share/gtk-doc/html/keybinder/index.html
 %%DOCS%%share/gtk-doc/html/keybinder/index.sgml
 %%DOCS%%share/gtk-doc/html/keybinder/keybinder-keybinder.html
-%%DOCS%%share/gtk-doc/html/keybinder/keybinder.devhelp
 %%DOCS%%share/gtk-doc/html/keybinder/keybinder.devhelp2
 %%DOCS%%share/gtk-doc/html/keybinder/left.png
 %%DOCS%%share/gtk-doc/html/keybinder/object-tree.html
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 25e498b568e1..fdc8c8d9b815 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -11,25 +11,18 @@ MAINTAINER=	mwm@mired.org
 COMMENT=	An X utility for binding commands to a hot key
 
 WRKSRC=		${WRKDIR}/keylaunch
-USE_GMAKE=	yes
-USES=		perl5
+USES=		perl5 gmake
 USE_PERL5=	build
 USE_XORG=	x11
 
-PKGMESSAGE=	${WRKSRC}/pkg-message
+SUB_FILES= 	pkg-message
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/example_rc ${EXAMPLESDIR}/keylaunch.rc
-
-post-install:
-	@${SED} -e 's;/usr/X11R6;${LOCALBASE};g' < ${FILESDIR}/pkg-message.in > \
-		${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example_rc ${STAGEDIR}${EXAMPLESDIR}/keylaunch.rc
 
 .include <bsd.port.mk>
diff --git a/x11/keylaunch/files/pkg-message.in b/x11/keylaunch/files/pkg-message.in
index c62987a1e76b..7220b1551613 100644
--- a/x11/keylaunch/files/pkg-message.in
+++ b/x11/keylaunch/files/pkg-message.in
@@ -1,2 +1,2 @@
-See /usr/X11R6/share/examples/keylaunch/keylaunch.rc for a sample
+See %%LOCALBASE%%/share/examples/keylaunch/keylaunch.rc for a sample
 configuration.
diff --git a/x11/keylaunch/pkg-plist b/x11/keylaunch/pkg-plist
index b84645000d23..f0aec16c23bc 100644
--- a/x11/keylaunch/pkg-plist
+++ b/x11/keylaunch/pkg-plist
@@ -1,3 +1,3 @@
 bin/keylaunch
-share/examples/keylaunch/keylaunch.rc
-@dirrm share/examples/keylaunch
+%%EXAMPLESDIR%%/keylaunch.rc
+@dirrmtry %%EXAMPLESDIR%%
diff --git a/x11/libxdg-basedir/Makefile b/x11/libxdg-basedir/Makefile
index 969d76bfaa23..b41ecfeadba5 100644
--- a/x11/libxdg-basedir/Makefile
+++ b/x11/libxdg-basedir/Makefile
@@ -9,11 +9,10 @@ MASTER_SITES=	http://nevill.ch/libxdg-basedir/downloads/
 MAINTAINER=	ntarmos@ceid.upatras.gr
 COMMENT=	Implementation of the XDG Base Directory specification
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 pre-configure:
 	@${REINPLACE_CMD} -e \
 		's|$$(libdir)/pkgconfig|$${prefix}/libdata/pkgconfig|' \
diff --git a/x11/lxrandr/Makefile b/x11/lxrandr/Makefile
index fd0cf9b59959..70656e57c9f9 100644
--- a/x11/lxrandr/Makefile
+++ b/x11/lxrandr/Makefile
@@ -17,8 +17,6 @@ USE_XORG=	xrandr
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-MAN1=		lxrandr.1
-
 PORTDOCS=	AUTHORS
 
 OPTIONS_DEFINE=	DOCS NLS
@@ -26,7 +24,6 @@ OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -42,8 +39,8 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/lxrandr/pkg-plist b/x11/lxrandr/pkg-plist
index 95aece7c4e5b..cce648c5f689 100644
--- a/x11/lxrandr/pkg-plist
+++ b/x11/lxrandr/pkg-plist
@@ -1,4 +1,5 @@
 bin/lxrandr
+man/man1/lxrandr.1.gz
 share/applications/lxrandr.desktop
 %%NLS%%share/locale/af/LC_MESSAGES/lxrandr.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/lxrandr.mo
@@ -60,11 +61,25 @@ share/applications/lxrandr.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lxrandr.mo
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
 %%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/tt_RU
+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/te
+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@latin
+%%NLS%%@dirrmtry share/locale/ps/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ps
 %%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/lg
 %%NLS%%@dirrmtry share/locale/frp/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/frp
+%%NLS%%@dirrmtry share/locale/fo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fo
 %%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/es_VE
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index 622319162671..877288bbc4f7 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -22,13 +22,12 @@ OPTIONS_DEFINE=	IMLIB2 XFT ULTRAGETOPT
 OPTIONS_DEFAULT=	IMLIB2 XFT ULTRAGETOPT
 ULTRAGETOPT_DESC=	Use Ultragetopt
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 MAKE_ARGS=	PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" CC="${CC}"
 
 .if ${PORT_OPTIONS:MULTRAGETOPT}
-LIB_DEPENDS+=	ultragetopt.0:${PORTSDIR}/devel/ultragetopt
+LIB_DEPENDS+=	libultragetopt.so:${PORTSDIR}/devel/ultragetopt
 MAKE_ARGS+=	USE_ULTRAGETOPT=yes
 .else
 MAKE_ARGS+=	USE_ULTRAGETOPT=no
diff --git a/x11/metalock/files/patch-Makefile b/x11/metalock/files/patch-Makefile
new file mode 100644
index 000000000000..acc66cfa4828
--- /dev/null
+++ b/x11/metalock/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.orig	2014-01-11 00:15:02.000000000 +0800
++++ Makefile	2014-01-11 00:16:03.000000000 +0800
+@@ -129,16 +129,16 @@ install: all
+ 	@echo "(the default theme is missing)"
+ .else
+ 	@echo installing executable file to ${DEST_PREFIX}/bin
+-	@mkdir -p ${DEST_PREFIX}/bin
+-	@cp -f metalock ${DEST_PREFIX}/bin
+-	@chmod 755 ${DEST_PREFIX}/bin/metalock
+-	@chmod u+s ${DEST_PREFIX}/bin/metalock
++	@mkdir -p $(DESTDIR)${DEST_PREFIX}/bin
++	@cp -f metalock $(DESTDIR)${DEST_PREFIX}/bin
++	@chmod 755 $(DESTDIR)${DEST_PREFIX}/bin/metalock
++	@chmod u+s $(DESTDIR)${DEST_PREFIX}/bin/metalock
+ 	@echo -n "installing theme to "
+ 	@echo "${DEST_PREFIX}/share/metalock/themes/${DEFAULT_THEME}"
+-	@mkdir -p ${DEST_PREFIX}/share/metalock/themes
+-	@cp -pRf ../themes/${DEFAULT_THEME} ${DEST_PREFIX}/share/metalock/themes
+-	@chown 0:0 ${DEST_PREFIX}/share/metalock/themes/${DEFAULT_THEME}/*
+-	@chmod 644 ${DEST_PREFIX}/share/metalock/themes/${DEFAULT_THEME}/*
++	@mkdir -p $(DESTDIR)${DEST_PREFIX}/share/metalock/themes
++	@cp -pRf ../themes/${DEFAULT_THEME} $(DESTDIR)${DEST_PREFIX}/share/metalock/themes
++	@chown 0:0 $(DESTDIR)${DEST_PREFIX}/share/metalock/themes/${DEFAULT_THEME}/*
++	@chmod 644 $(DESTDIR)${DEST_PREFIX}/share/metalock/themes/${DEFAULT_THEME}/*
+ 	@echo "finished installing metalock"
+ .endif
+ 
diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile
index 4bdbd520c117..923d7396e406 100644
--- a/x11/ooxcb/Makefile
+++ b/x11/ooxcb/Makefile
@@ -14,5 +14,4 @@ USE_XORG=	xcb
 USE_PYDISTUTILS=easy_install
 PLIST_FILES=	${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index fe141377a8be..3ff8ed171d8d 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -18,8 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	clipaccumulate.1 clipbrowse.1 clipedit.1 clipfilter.1 clipjoin.1
-MAN3=	Clipboard.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/p5-Clipboard/pkg-plist b/x11/p5-Clipboard/pkg-plist
index 06bdc4ec4fc3..a775463ec7ac 100644
--- a/x11/p5-Clipboard/pkg-plist
+++ b/x11/p5-Clipboard/pkg-plist
@@ -3,10 +3,16 @@ bin/clipbrowse
 bin/clipedit
 bin/clipfilter
 bin/clipjoin
+%%PERL5_MAN3%%/Clipboard.3.gz
 %%SITE_PERL%%/Clipboard.pm
 %%SITE_PERL%%/Clipboard/MacPasteboard.pm
 %%SITE_PERL%%/Clipboard/Win32.pm
 %%SITE_PERL%%/Clipboard/Xclip.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard/.packlist
+man/man1/clipaccumulate.1.gz
+man/man1/clipbrowse.1.gz
+man/man1/clipedit.1.gz
+man/man1/clipfilter.1.gz
+man/man1/clipjoin.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard
 @dirrmtry %%SITE_PERL%%/Clipboard
diff --git a/x11/p5-X11-Resolution/Makefile b/x11/p5-X11-Resolution/Makefile
index 19e05d840199..cff62dba23ac 100644
--- a/x11/p5-X11-Resolution/Makefile
+++ b/x11/p5-X11-Resolution/Makefile
@@ -15,7 +15,4 @@ RUN_DEPENDS=	p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		X11::Resolution.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/p5-X11-Resolution/pkg-plist b/x11/p5-X11-Resolution/pkg-plist
index a042f4d073e1..45a73a8f2a78 100644
--- a/x11/p5-X11-Resolution/pkg-plist
+++ b/x11/p5-X11-Resolution/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/X11::Resolution.3.gz
 %%SITE_PERL%%/X11/Resolution.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Resolution/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Resolution
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Resolution
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
 @dirrmtry %%SITE_PERL%%/X11
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index 2bd199af6627..6625e33157b3 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -17,9 +17,7 @@ USE_GNOME=	vte gtk20
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
 
-MAN8=		stjerm.8
 LICENSE_FILE=	${WRKSRC}/COPYING
-PLIST_FILES=	bin/stjerm
+PLIST_FILES=	bin/stjerm man/man8/${PORTNAME}.8.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 2cf0d7f022cf..57db8bf8032e 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -18,8 +18,6 @@ EXTRACT_CMD=		${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	| ${SH}
 
-MAN1=		sxpc.1
-PLIST_FILES=	bin/sxpc
+PLIST_FILES=	bin/sxpc man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/thingylaunch/Makefile b/x11/thingylaunch/Makefile
index 05c3006b11ee..559fa0c88a9d 100644
--- a/x11/thingylaunch/Makefile
+++ b/x11/thingylaunch/Makefile
@@ -21,5 +21,4 @@ GH_COMMIT=	8acab93
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 882b88b06f8e..f163b8706e56 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -12,22 +12,19 @@ MASTER_SITE_SUBDIR=	uqs
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Clipboard history management dockapp for Window Maker
 
+SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		pkgconfig
 USE_XORG=	xpm
 USE_GNOME=	gtk20
 
-NO_STAGE=	yes
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/wmcliphistrc ${EXAMPLESDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/wmcliphistrc ${STAGEDIR}${EXAMPLESDIR}
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif #NOPORTDOCS
 
-post-install:
-	@${SED} 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/x11/wmcliphist/pkg-message b/x11/wmcliphist/files/pkg-message.in
index 6bdae0d079f8..6bdae0d079f8 100644
--- a/x11/wmcliphist/pkg-message
+++ b/x11/wmcliphist/files/pkg-message.in
diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
index 4c03928f9cf8..7aad6b044cda 100644
--- a/x11/wmctrl/Makefile
+++ b/x11/wmctrl/Makefile
@@ -15,9 +15,6 @@ GNU_CONFIGURE=	yes
 USE_XORG=	x11 xmu xext xt
 USE_GNOME=	glib20
 
-PLIST_FILES=	bin/wmctrl
+PLIST_FILES=	bin/wmctrl man/man1/${PORTNAME}.1.gz
 
-MAN1=		wmctrl.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 130eeed30427..18b232cb100a 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -21,10 +21,6 @@ MAKE_ENV+=	${CONFIGURE_ENV}
 
 SUB_FILES+=	pkg-message
 
-MANCOMPRESSED=	yes
-MAN1=	wmdrawer.1x
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" ${WRKSRC}/wmdrawerrc.example
 	@${REINPLACE_CMD} -e "s,CFLAGS = -O3,CFLAGS +=,g; \
@@ -34,8 +30,7 @@ post-patch:
 		s,/usr/X11R6,${LOCALBASE},g" ${WRKSRC}/Makefile
 
 post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/logo-beastie.png ${DATADIR}/beastie.png
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/logo-beastie.png ${STAGEDIR}${DATADIR}/beastie.png
 
 .include <bsd.port.mk>
diff --git a/x11/wmdrawer/files/patch-Makefile b/x11/wmdrawer/files/patch-Makefile
new file mode 100644
index 000000000000..67eab08cfc8b
--- /dev/null
+++ b/x11/wmdrawer/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	2014-01-11 11:20:26.000000000 +0800
++++ Makefile	2014-01-11 11:20:56.000000000 +0800
+@@ -68,10 +68,10 @@ clean :
+ 	$(RM) *.o $(PRGS)
+ 
+ install : wmdrawer
+-	$(INSTALL) -m 755 wmdrawer $(PREFIX)/bin
+-	$(INSTALL) -m 644 doc/wmdrawer.1x.gz $(MANDIR)
+-	$(INSTALL) -d $(DOCDIR)/wmdrawer
+-	$(INSTALL) -m 644 wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO $(DOCDIR)/wmdrawer
++	$(INSTALL) -m 755 wmdrawer $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL) -m 644 doc/wmdrawer.1x.gz $(DESTDIR)$(MANDIR)/wmdrawer.1.gz
++	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/wmdrawer
++	$(INSTALL) -m 644 wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO $(DESTDIR)$(DOCDIR)/wmdrawer
+ 
+ uninstall: clean
+ 	$(RM) $(PREFIX)/bin/wmdrawer
diff --git a/x11/wmdrawer/pkg-plist b/x11/wmdrawer/pkg-plist
index 350d6aaf9b44..4e6b9c63a9ec 100644
--- a/x11/wmdrawer/pkg-plist
+++ b/x11/wmdrawer/pkg-plist
@@ -1,5 +1,5 @@
 bin/wmdrawer
-%%DATADIR%%/beastie.png
+man/man1/wmdrawer.1.gz
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
@@ -7,5 +7,6 @@ bin/wmdrawer
 %%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
 %%DOCSDIR%%/wmdrawerrc.example
-@dirrm %%DOCSDIR%%
+%%DATADIR%%/beastie.png
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 99a58dec02dd..5062e1a1d561 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -15,16 +15,13 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
-MAN1=		Xdialog.1
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(.PARSEDIR)
-USE_GMAKE=	yes
+USES=		gmake
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MNLS)
@@ -46,10 +43,10 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/samples
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${DOCSDIR}/samples
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/samples
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${DOCSDIR}/samples
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xdialog/pkg-plist b/x11/xdialog/pkg-plist
index bb5a9a4ed132..c2150e969cb3 100644
--- a/x11/xdialog/pkg-plist
+++ b/x11/xdialog/pkg-plist
@@ -1,17 +1,5 @@
 bin/Xdialog
-%%NLS%%share/locale/ca/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/de/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/es/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/id/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/it/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/no_NO/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/Xdialog.mo
-%%NLS%%share/locale/sv_SE/LC_MESSAGES/Xdialog.mo
+man/man1/Xdialog.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/2ranges.png
 %%PORTDOCS%%%%DOCSDIR%%/authors.html
 %%PORTDOCS%%%%DOCSDIR%%/box.html
@@ -53,17 +41,6 @@ bin/Xdialog
 %%PORTDOCS%%%%DOCSDIR%%/range.png
 %%PORTDOCS%%%%DOCSDIR%%/rcfile.png
 %%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/special.html
-%%PORTDOCS%%%%DOCSDIR%%/spinbox.png
-%%PORTDOCS%%%%DOCSDIR%%/syntax.html
-%%PORTDOCS%%%%DOCSDIR%%/tailbox.png
-%%PORTDOCS%%%%DOCSDIR%%/timebox.png
-%%PORTDOCS%%%%DOCSDIR%%/title.png
-%%PORTDOCS%%%%DOCSDIR%%/transient.html
-%%PORTDOCS%%%%DOCSDIR%%/treeview.png
-%%PORTDOCS%%%%DOCSDIR%%/withtags.png
-%%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
-%%PORTDOCS%%%%DOCSDIR%%/yesno.png
 %%PORTDOCS%%%%DOCSDIR%%/samples/Xdialog.wrapper.c
 %%PORTDOCS%%%%DOCSDIR%%/samples/Xmessage
 %%PORTDOCS%%%%DOCSDIR%%/samples/Xmore
@@ -100,9 +77,33 @@ bin/Xdialog
 %%PORTDOCS%%%%DOCSDIR%%/samples/warning.xpm
 %%PORTDOCS%%%%DOCSDIR%%/samples/xlock-wrapper
 %%PORTDOCS%%%%DOCSDIR%%/samples/yesno
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/no_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no_NO
+%%PORTDOCS%%%%DOCSDIR%%/special.html
+%%PORTDOCS%%%%DOCSDIR%%/spinbox.png
+%%PORTDOCS%%%%DOCSDIR%%/syntax.html
+%%PORTDOCS%%%%DOCSDIR%%/tailbox.png
+%%PORTDOCS%%%%DOCSDIR%%/timebox.png
+%%PORTDOCS%%%%DOCSDIR%%/title.png
+%%PORTDOCS%%%%DOCSDIR%%/transient.html
+%%PORTDOCS%%%%DOCSDIR%%/treeview.png
+%%PORTDOCS%%%%DOCSDIR%%/withtags.png
+%%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
+%%PORTDOCS%%%%DOCSDIR%%/yesno.png
+%%NLS%%share/locale/ca/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/id/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/no_NO/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/Xdialog.mo
 %%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sv_SE
+%%NLS%%@dirrmtry share/locale/no_NO/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/no_NO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile
index 7589c9e32844..02f9ceff8cfd 100644
--- a/x11/xdotool/Makefile
+++ b/x11/xdotool/Makefile
@@ -14,11 +14,7 @@ USES=		gmake pkgconfig perl5
 USE_XORG=	x11 xtst xinerama
 USE_PERL5=	build
 
-MAN1=		xdotool.1
-PLIST_FILES=	bin/xdotool lib/libxdo.so lib/libxdo.so.2 include/xdo.h
-
 # Older GCC on RELENG_6 doesn't like -Wno-missing-field-initializers
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,-Wno-missing-field-initializers,,' \
 		${WRKSRC}/Makefile
diff --git a/x11/xdotool/pkg-plist b/x11/xdotool/pkg-plist
new file mode 100644
index 000000000000..c9061ce4756a
--- /dev/null
+++ b/x11/xdotool/pkg-plist
@@ -0,0 +1,5 @@
+bin/xdotool
+include/xdo.h
+lib/libxdo.so
+lib/libxdo.so.2
+man/man1/xdotool.1.gz
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index d0e3186697bf..bed88adf7e49 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -12,21 +12,18 @@ COMMENT=	Record, repeat, and play key sequence from keyboard
 
 MAKE_ENV=	X11BASE=${LOCALBASE}
 USE_XORG=	x11 xt
-MAN1=		xkeywrap.1
-MANCOMPRESSED=	yes
 
 PORTDOCS=	README demo.dat xkeywrap_demo.c
 
-PLIST_FILES=	bin/xkeywrap
+PLIST_FILES=	bin/xkeywrap man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xkeywrap ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xkeywrap.1.gz ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/xkeywrap ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xkeywrap.1.gz ${STAGEDIR}${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index 9f31d45b9c90..8d29d06b0166 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/xscreensaverapp/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	hemi@puresimplicity.net
 COMMENT=	WindowMaker dockapp to control XScreenSaver
 
-LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
+LIB_DEPENDS=	libdockapp.so:${PORTSDIR}/x11-wm/libdockapp
 
 PLIST_FILES=	bin/XScreenSaver.App
 GNU_CONFIGURE=	yes
@@ -19,5 +19,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ARGS=	"LDFLAGS+=-L${LOCALBASE}/lib -lX11"
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile
index 57f0ae73a8a2..9f4c31190072 100644
--- a/x11/xsel-conrad/Makefile
+++ b/x11/xsel-conrad/Makefile
@@ -21,23 +21,21 @@ CONFLICTS_INSTALL=	xsel-[0-9]*
 USE_XORG=	x11 xext xt xproto ice sm
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lXext -lX11
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTDOCS=	ChangeLog README
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|jmp_buf|sigjmp_buf|g' ${WRKSRC}/xsel.c
 	@${REINPLACE_CMD} -e 's|@X_CFLAGS@|${CFLAGS}|;\
 		s|@X_LIBS@|${LDFLAGS}|' ${WRKSRC}/Makefile.in
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
 .ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
+	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 6dc871d69d89..3f7845a2f980 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Create a full-screen image to adjust your monitor
 
 USES=		imake
 USE_XORG=	x11 xext
-MAN1=		xtestpicture.1
-PLIST_FILES=	bin/xtestpicture
+PLIST_FILES=	bin/xtestpicture man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xwinwrap/Makefile b/x11/xwinwrap/Makefile
index 97e11b91b825..4e9955db9bd9 100644
--- a/x11/xwinwrap/Makefile
+++ b/x11/xwinwrap/Makefile
@@ -18,7 +18,6 @@ USE_XORG=	x11 xproto xrender xext
 PLIST_FILES=	bin/${PORTNAME}
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
diff --git a/x11/xwinwrap/files/patch-Makefile b/x11/xwinwrap/files/patch-Makefile
index 83efc79954a2..f2b65bdb1b22 100644
--- a/x11/xwinwrap/files/patch-Makefile
+++ b/x11/xwinwrap/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-11-16 20:42:09.000000000 +0700
-+++ Makefile	2009-11-17 04:52:13.000000000 +0700
+--- Makefile.orig	2009-11-16 21:42:09.000000000 +0800
++++ Makefile	2014-01-11 00:00:12.000000000 +0800
 @@ -1,22 +1,23 @@
 -all: all64 all32
 -
@@ -38,7 +38,7 @@
 +	fi;
  
 +install:
-+	$(INSTALL) $(TARGET) $(PREFIX)/bin
++	$(INSTALL) $(TARGET) $(DESTDIR)$(PREFIX)/bin
  clean:
 -	-rm -rf x86_64/ i386/
 -
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index 25b381728fa8..11f956f4d07e 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -14,15 +14,14 @@ COMMENT=	An enhanced execution box with regex pattern matching
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
-NO_STAGE=	yes
 
 ALL_TARGET=	yalias
 MAKE_ARGS=	prefix=${PREFIX} YALIASDIR=${DATADIR}
 
 .ifndef(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/yalias/files/patch-Makefile b/x11/yalias/files/patch-Makefile
new file mode 100644
index 000000000000..c18c809a37a8
--- /dev/null
+++ b/x11/yalias/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	2014-01-11 00:02:15.000000000 +0800
++++ Makefile	2014-01-11 00:02:45.000000000 +0800
+@@ -23,10 +23,10 @@ clean:
+ distclean: clean
+ 
+ install: yalias
+-	mkdir -p $(bindir)
+-	install -m755 yalias $(bindir)/yalias
+-	mkdir -p $(YALIASDIR)
+-	install -m644 system.yaliasrc $(YALIASDIR)/system.yaliasrc
++	mkdir -p $(DESTDIR)$(bindir)
++	install -m755 yalias $(DESTDIR)$(bindir)/yalias
++	mkdir -p $(DESTDIR)$(YALIASDIR)
++	install -m644 system.yaliasrc $(DESTDIR)$(YALIASDIR)/system.yaliasrc
+ 
+ dist: distclean
+ 	-cd .. && ln -sf $(PACKAGE) $(DISTNAME) && tar --exclude='CVS' --exclude='old' -czhpvf $(DISTNAME).tar.gz $(DISTNAME)
diff --git a/x11/yalias/pkg-plist b/x11/yalias/pkg-plist
index 8bc8bdbedcd0..855a5a565d5d 100644
--- a/x11/yalias/pkg-plist
+++ b/x11/yalias/pkg-plist
@@ -1,5 +1,5 @@
 bin/yalias
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/system.yaliasrc
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%