- make buildable for all versions of X

- resolve conflicts with x*-clients and x*-libraries

2 files changed, 74 insertions, 46 deletions

diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 375545e22d56..64594404f722 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -27,14 +27,12 @@ GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.5.9
 
 MAN1=		dgs.1 dpsnx.agent.1
-MANN=		dpsexec.man makepsres.man xepsf.man
+MANN=		dpsexec.man xepsf.man
+INSTALLDIRS=	gs DPS/clients/pswrap \
+		DPS/demos/dpsexec DPS/demos/xepsf
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-IGNORE=		is included in XFree86 4.x and above
-.endif
-
 pre-fetch:
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
@@ -47,4 +45,34 @@ pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|manm|mann|g'
 
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+INSTALLDIRS+=	DPS/clients/makepsres DPS/demos/texteroids
+MANN+=		makepsres.man
+.endif
+
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+PLIST_SUB+=	WITH_XORG=""
+PLIST_SUB+=	WITH_XFREE4=""
+.else
+PLIST_SUB+=	WITH_XORG="@comment "
+
+.if ${X_WINDOW_SYSTEM:L} == xorg
+INSTALLDIRS+=	DPS/lib/dpstk DPS/lib/psres
+PLIST_SUB+=	WITH_XFREE4=""
+.else
+PLIST_SUB+=	WITH_XFREE4="@comment "
+.endif
+
+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_MAN} ${WRKSRC}/dpsnx.agent.1 ${PREFIX}/man/man1/
+.for i in ${INSTALLDIRS}
+	@(cd ${INSTALL_WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
+
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index 07ad74d90a6a..36a813516eb1 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -2,48 +2,48 @@ bin/dgs
 bin/dgs-config
 bin/dpsexec
 bin/dpsnx.agent
-bin/makepsres
+%%WITH_XFREE4%%bin/makepsres
 bin/pswrap
-bin/texteroids
+%%WITH_XFREE4%%bin/texteroids
 bin/xepsf
-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
+%%WITH_XORG%%include/DPS/ColorSB.h
+%%WITH_XORG%%include/DPS/ColorSBP.h
+%%WITH_XORG%%include/DPS/DPSScrollW.h
+%%WITH_XORG%%include/DPS/DPSScrollWP.h
+%%WITH_XORG%%include/DPS/FontCreatP.h
+%%WITH_XORG%%include/DPS/FontCreato.h
+%%WITH_XORG%%include/DPS/FontSB.h
+%%WITH_XORG%%include/DPS/FontSBP.h
+%%WITH_XORG%%include/DPS/FontSamplP.h
+%%WITH_XORG%%include/DPS/FontSample.h
+%%WITH_XORG%%include/DPS/PSres.h
+%%WITH_XORG%%include/DPS/XDPS.h
+%%WITH_XORG%%include/DPS/XDPSlib.h
+%%WITH_XORG%%include/DPS/XDPSproto.h
+%%WITH_XORG%%include/DPS/dpsNXargs.h
+%%WITH_XORG%%include/DPS/dpsXclient.h
+%%WITH_XORG%%include/DPS/dpsXcommon.h
+%%WITH_XORG%%include/DPS/dpsXpreview.h
+%%WITH_XORG%%include/DPS/dpsXshare.h
+%%WITH_XORG%%include/DPS/dpsXuserpath.h
+%%WITH_XORG%%include/DPS/dpsclient.h
+%%WITH_XORG%%include/DPS/dpsconfig.h
+%%WITH_XORG%%include/DPS/dpsexcept.h
+%%WITH_XORG%%include/DPS/dpsfriends.h
+%%WITH_XORG%%include/DPS/dpsops.h
+%%WITH_XORG%%include/DPS/psops.h
+%%WITH_XORG%%lib/libdps.a
+%%WITH_XORG%%lib/libdps.la
+%%WITH_XORG%%lib/libdps.so
+%%WITH_XORG%%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
 share/ghostscript/5.50/Fontmap
 share/ghostscript/5.50/doc/Bug-form.htm
@@ -114,7 +114,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
-@dirrm include/DPS
+%%WITH_XORG%%@dirrm include/DPS
 @dirrmtry share/ghostscript/5.50/doc
 @dirrmtry share/ghostscript/5.50/examples
 @dirrmtry share/ghostscript/5.50