summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2006-04-16 11:47:05 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2006-04-16 11:47:05 +0000
commit9411240072409d6dfa838f63be635667bc5c4cac (patch)
treed5b61c42afeaaf700f96f076ad1846eeccc7e364
parent- make buildable for all versions of X (diff)
- fix build of gnustep-xdps
Notes
Notes: svn path=/head/; revision=159691
-rw-r--r--x11-toolkits/gnustep-back/Makefile14
1 files changed, 3 insertions, 11 deletions
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 9938079d2da4..9ddeff69da8a 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -40,6 +40,9 @@ BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
BREAKS_IF_PEDANTIC= yes
.if defined(WITH_GNUSTEP_XDPS)
+GNUSTEP_DGS_PORT?= x11/dgs
+BUILD_DEPENDS+= pswrap:${PORTSDIR}/${GNUSTEP_DGS_PORT}
+LIB_DEPENDS+= dpstk:${PORTSDIR}/${GNUSTEP_DGS_PORT}
CONFIGURE_ARGS+= --enable-graphics=xdps --with-name=xdps
CONFIGURE_ARGS+= --disable-glitz
PLIST_SUB+= BACK=xdps-${BACKVERSION}
@@ -87,17 +90,6 @@ ADDITIONAL_LDFLAGS+= -L/usr/lib -lcipher
MAKE_ENV+= ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
.endif
-.if defined(WITH_GNUSTEP_XDPS)
-.if ${X_WINDOW_SYSTEM:L} == xorg
-XORG_LIBRARIES_PORT!= (cd ${PORTSDIR}/${GNUSTEP_GUI_PORT} && make -V X_LIBRARIES_PORT)
-XORG_PORTVERSION!= (cd ${XORG_LIBRARIES_PORT} && make -V PORTVERSION)
-XORG_VERSION= ${XORG_PORTVERSION:S=.==g}
-.if ${XORG_VERSION} >= 690
-BROKEN= xdps is no longer supported by xorg version 6.9.0 and above
-.endif
-.endif
-.endif
-
pre-configure:
.for file in config.guess config.sub install-sh
@${CP} ${PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}