5 files changed, 38 insertions, 49 deletions
diff --git a/ports-mgmt/portshaker-config/Makefile b/ports-mgmt/portshaker-config/Makefile
index 6c59217bbc05..16fa5557f90d 100644
--- a/ports-mgmt/portshaker-config/Makefile
+++ b/ports-mgmt/portshaker-config/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	portshaker-config
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	romain@FreeBSD.org
@@ -16,5 +17,11 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/portshaker.d
+
+post-install:
+	@${MV} ${STAGEDIR}${PREFIX}/etc/portshaker.conf \
+		${STAGEDIR}${PREFIX}/etc/portshaker.conf.sample-config
+
 .include "${MASTERDIR}/Makefile"
diff --git a/ports-mgmt/portshaker-config/pkg-plist b/ports-mgmt/portshaker-config/pkg-plist
index 248c30b9d2cf..10b8010fb72e 100644
--- a/ports-mgmt/portshaker-config/pkg-plist
+++ b/ports-mgmt/portshaker-config/pkg-plist
@@ -1,4 +1,6 @@
-etc/portshaker.conf
+@unexec if cmp -s %D/etc/portshaker.conf.sample-config %D/etc/portshaker.conf; then rm -f %D/etc/portshaker.conf; fi
+etc/portshaker.conf.sample-config
+@exec if [ ! -f %D/etc/portshaker.conf ] ; then cp -p %D/%F %B/portshaker.conf; fi
 etc/portshaker.d/bsd_sharp
 etc/portshaker.d/bsd_sharp_releng_2_0
 etc/portshaker.d/bsd_sharp_releng_2_2
diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile
index dd02ff4186df..d2f578f24f57 100644
--- a/ports-mgmt/portshaker/Makefile
+++ b/ports-mgmt/portshaker/Makefile
@@ -22,9 +22,10 @@ OPTIONS_DEFAULT=	RSYNC SVN
 RSYNC_DESC=	rsync support
 GIT_DESC=	git support
 HG_DESC=	mercurial support
-MAN5=		portshaker.conf.5 \
-		portshaker.d.5
-MAN8=		portshaker.8
+RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+HG_RUN_DEPENDS=		hg:${PORTSDIR}/devel/mercurial
 .else
 OPTIONS_DEFINE=	BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG
 OPTIONS_DEFAULT=	BSDSHARP
@@ -35,50 +36,13 @@ HASKELL_DESC=		Enable Haskell ports
 MARCUSCOM_DESC=		Enable GNOME development ports
 TEXLIVE_DESC=		Enable TeXLive ports (Experimental)
 XORG_DESC=		Enable Xorg development ports
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORTNAME} == "portshaker"
-
-. if ${PORT_OPTIONS:MRSYNC}
-RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
-. endif
-. if ${PORT_OPTIONS:MSVN}
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-. endif
-. if ${PORT_OPTIONS:MGIT}
-RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
-. endif
-. if ${PORT_OPTIONS:MHG}
-RUN_DEPENDS+=	hg:${PORTSDIR}/devel/mercurial
-. endif
-
-.else
-
-. if ${PORT_OPTIONS:MBSDSHARP}
-MAKE_ENV+=	WITH_BSDSHARP=1
-. endif
-. if ${PORT_OPTIONS:MENLIGHTENMENT}
-MAKE_ENV+=	WITH_ENLIGHTENMENT=1
-. endif
-. if ${PORT_OPTIONS:MGECKO}
-MAKE_ENV+=	WITH_GECKO=1
-. endif
-. if ${PORT_OPTIONS:MHASKELL}
-MAKE_ENV+=	WITH_HASKELL=1
-. endif
-. if ${PORT_OPTIONS:MMARCUSCOM}
-MAKE_ENV+=	WITH_MARCUSCOM=1
-. endif
-. if ${PORT_OPTIONS:MTEXLIVE}
-MAKE_ENV+=	WITH_TEXLIVE=1
-. endif
-. if ${PORT_OPTIONS:MXORG}
-MAKE_ENV+=	WITH_XORG=1
-. endif
-
+BSDSHARP_MAKE_ENV=	WITH_BSDSHARP=1
+ENLIGHTENMENT_MAKE_ENV=	WITH_ENLIGHTENMENT=1
+GECKO_MAKE_ENV=		WITH_GECKO=1
+HASKELL_MAKE_ENV=	WITH_HASKELL=1
+MARCUSCOM_MAKE_ENV=	WITH_MARCUSCOM=1
+TEXLIVE_MAKE_ENV=	WITH_TEXLIVE=1
+XORG_MAKE_ENV=		WITH_XORG=1
 .endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portshaker/files/patch-Makefile b/ports-mgmt/portshaker/files/patch-Makefile
new file mode 100644
index 000000000000..a4963cd0ad60
--- /dev/null
+++ b/ports-mgmt/portshaker/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- ./Makefile.orig	2014-01-17 20:30:31.000000000 +0100
++++ ./Makefile	2014-02-27 16:03:26.000000000 +0100
+@@ -30,8 +30,8 @@
+ 		> ${.TARGET}
+ 
+ beforeinstall:
+-	if [ ! -d "${SHAREDIR}/portshaker" ]; then mkdir -p "${SHAREDIR}/portshaker"; fi
+-	if [ ! -d "${ETCDIR}/portshaker.d" ]; then mkdir -p "${ETCDIR}/portshaker.d"; fi
++	if [ ! -d "${DESTDIR}${SHAREDIR}/portshaker" ]; then mkdir -p "${DESTDIR}${SHAREDIR}/portshaker"; fi
++	if [ ! -d "${DESTDIR}${ETCDIR}/portshaker.d" ]; then mkdir -p "${DESTDIR}${ETCDIR}/portshaker.d"; fi
+ 
+ tarball:
+ 	git archive -o ${TARBALL} v${VERSION}
diff --git a/ports-mgmt/portshaker/pkg-plist b/ports-mgmt/portshaker/pkg-plist
index b142cc3ac027..93e2153f3852 100644
--- a/ports-mgmt/portshaker/pkg-plist
+++ b/ports-mgmt/portshaker/pkg-plist
@@ -1,5 +1,8 @@
 bin/portshaker
 etc/portshaker.conf.sample
+man/man5/portshaker.conf.5.gz
+man/man5/portshaker.d.5.gz
+man/man8/portshaker.8.gz
 %%DATADIR%%/merge-updating.awk
 %%DATADIR%%/portshaker.subr
 @exec mkdir -p %D/etc/portshaker.d