2 files changed, 48 insertions, 52 deletions

diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 0f79b98c5e90..eb8e822c82d8 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dgs
 PORTVERSION=	0.5.9.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	dgs
@@ -29,8 +29,10 @@ USE_AUTOTOOLS=	libtool:15
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.5.9
 
 MAN1=		dgs.1 dpsnx.agent.1
-MANN=		dpsexec.man xepsf.man
-INSTALLDIRS=	gs DPS/demos/dpsexec DPS/demos/xepsf
+MANN=		dpsexec.man makepsres.man xepsf.man
+INSTALLDIRS=	gs DPS/clients/makepsres DPS/clients/pswrap \
+		DPS/demos/dpsexec DPS/demos/texteroids DPS/demos/xepsf \
+		DPS/lib/dpstk DPS/lib/psres DPS/lib/dps DPS/include/DPS
 
 .include <bsd.port.pre.mk>
 
@@ -42,15 +44,10 @@ post-patch:
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
 		${WRKSRC}/DPS/ltconfig
 
-INSTALLDIRS+=	DPS/clients/makepsres DPS/clients/pswrap DPS/demos/texteroids \
-		DPS/lib/dpstk DPS/lib/psres DPS/lib/dps DPS/include/DPS
-MANN+=		makepsres.man
-PLIST_SUB+=	WITH_XFREE4=""
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dgs-config ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/dpsnx.agent ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/path_dps.m4 ${PREFIX}/share/aclocal/
+#	${INSTALL_DATA} ${WRKSRC}/path_dps.m4 ${PREFIX}/share/aclocal/
 	${INSTALL_MAN} ${WRKSRC}/dpsnx.agent.1 ${PREFIX}/man/man1/
 .for i in ${INSTALLDIRS}
 	@(cd ${INSTALL_WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} \
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index 141e7e9d3f54..b517c4e48ca8 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -2,49 +2,48 @@ bin/dgs
 bin/dgs-config
 bin/dpsexec
 bin/dpsnx.agent
-%%WITH_XFREE4%%bin/makepsres
-%%WITH_XFREE4%%bin/pswrap
-%%WITH_XFREE4%%bin/texteroids
+bin/makepsres
+bin/pswrap
+bin/texteroids
 bin/xepsf
-%%WITH_XFREE4%%include/DPS/ColorSB.h
-%%WITH_XFREE4%%include/DPS/ColorSBP.h
-%%WITH_XFREE4%%include/DPS/DPSScrollW.h
-%%WITH_XFREE4%%include/DPS/DPSScrollWP.h
-%%WITH_XFREE4%%include/DPS/FontCreatP.h
-%%WITH_XFREE4%%include/DPS/FontCreato.h
-%%WITH_XFREE4%%include/DPS/FontSB.h
-%%WITH_XFREE4%%include/DPS/FontSBP.h
-%%WITH_XFREE4%%include/DPS/FontSamplP.h
-%%WITH_XFREE4%%include/DPS/FontSample.h
-%%WITH_XFREE4%%include/DPS/PSres.h
-%%WITH_XFREE4%%include/DPS/XDPS.h
-%%WITH_XFREE4%%include/DPS/XDPSlib.h
-%%WITH_XFREE4%%include/DPS/XDPSproto.h
-%%WITH_XFREE4%%include/DPS/dpsNXargs.h
-%%WITH_XFREE4%%include/DPS/dpsXclient.h
-%%WITH_XFREE4%%include/DPS/dpsXcommon.h
-%%WITH_XFREE4%%include/DPS/dpsXpreview.h
-%%WITH_XFREE4%%include/DPS/dpsXshare.h
-%%WITH_XFREE4%%include/DPS/dpsXuserpath.h
-%%WITH_XFREE4%%include/DPS/dpsclient.h
-%%WITH_XFREE4%%include/DPS/dpsconfig.h
-%%WITH_XFREE4%%include/DPS/dpsexcept.h
-%%WITH_XFREE4%%include/DPS/dpsfriends.h
-%%WITH_XFREE4%%include/DPS/dpsops.h
-%%WITH_XFREE4%%include/DPS/psops.h
-%%WITH_XFREE4%%lib/libdps.a
-%%WITH_XFREE4%%lib/libdps.la
-%%WITH_XFREE4%%lib/libdps.so
-%%WITH_XFREE4%%lib/libdps.so.0
-%%WITH_XFREE4%%lib/libdpstk.a
-%%WITH_XFREE4%%lib/libdpstk.la
-%%WITH_XFREE4%%lib/libdpstk.so
-%%WITH_XFREE4%%lib/libdpstk.so.0
-%%WITH_XFREE4%%lib/libpsres.a
-%%WITH_XFREE4%%lib/libpsres.la
-%%WITH_XFREE4%%lib/libpsres.so
-%%WITH_XFREE4%%lib/libpsres.so.0
-share/aclocal/path_dps.m4
+include/DPS/ColorSB.h
+include/DPS/ColorSBP.h
+include/DPS/DPSScrollW.h
+include/DPS/DPSScrollWP.h
+include/DPS/FontCreatP.h
+include/DPS/FontCreato.h
+include/DPS/FontSB.h
+include/DPS/FontSBP.h
+include/DPS/FontSamplP.h
+include/DPS/FontSample.h
+include/DPS/PSres.h
+include/DPS/XDPS.h
+include/DPS/XDPSlib.h
+include/DPS/XDPSproto.h
+include/DPS/dpsNXargs.h
+include/DPS/dpsXclient.h
+include/DPS/dpsXcommon.h
+include/DPS/dpsXpreview.h
+include/DPS/dpsXshare.h
+include/DPS/dpsXuserpath.h
+include/DPS/dpsclient.h
+include/DPS/dpsconfig.h
+include/DPS/dpsexcept.h
+include/DPS/dpsfriends.h
+include/DPS/dpsops.h
+include/DPS/psops.h
+lib/libdps.a
+lib/libdps.la
+lib/libdps.so
+lib/libdps.so.0
+lib/libdpstk.a
+lib/libdpstk.la
+lib/libdpstk.so
+lib/libdpstk.so.0
+lib/libpsres.a
+lib/libpsres.la
+lib/libpsres.so
+lib/libpsres.so.0
 share/ghostscript/5.50/Fontmap
 share/ghostscript/5.50/doc/Bug-form.htm
 share/ghostscript/5.50/doc/C-style.htm
@@ -114,7 +113,7 @@ share/ghostscript/5.50/gs_typ32.ps
 share/ghostscript/5.50/gs_typ42.ps
 share/ghostscript/5.50/gs_type1.ps
 share/ghostscript/5.50/gs_wan_e.ps
-%%WITH_XFREE4%%@dirrm include/DPS
+@dirrm include/DPS
 @dirrmtry share/ghostscript/5.50/doc
 @dirrmtry share/ghostscript/5.50/examples
 @dirrmtry share/ghostscript/5.50