3 files changed, 15 insertions, 41 deletions

diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 4034b3657c53..3614af9d3cbf 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -1,15 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	gnustep-back
-PORTVERSION=	0.22.0
+PORTVERSION=	0.23.0
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
 PKGNAMESUFFIX?=	${BACK_SUFFIX}${PKGNAMESUFFIX2}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	GNUstep GUI backend
 
+LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
@@ -24,12 +25,14 @@ CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-tiff-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-jpeg-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-jpeg-include=${LOCALBASE}/include
-USE_GNUSTEP=	yes
+CONFIGURE_ARGS+=	--with-gif-library=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-gif-include=${LOCALBASE}/include
+USE_GNUSTEP=		yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_XORG=		xft xrender xmu xext x11
+USE_XORG=		xft xrender xmu xext x11 xcursor xfixes xmu 
 USE_GL=			yes
 
 MAKE_FLAGS+=		OPTFLAG="${CFLAGS} -I${LOCALBASE}/include"
@@ -37,41 +40,13 @@ MAKE_ENV+=		GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 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+=		dgs:${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}
-PLIST_SUB+=		WITH_XLIB="@comment "
-BACK_SUFFIX?=		-xdps
-CONFLICTS?=		gunstep-back-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
-.elif defined(WITH_GNUSTEP_LIBART)
-LIB_DEPENDS+=		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
-CONFIGURE_ARGS+=	--enable-graphics=art --with-name=art
-CONFIGURE_ARGS+=	--disable-glitz
-PLIST_SUB+=		BACK=art-${BACKVERSION}
-PLIST_SUB+=		WITH_XLIB="@comment "
-BACK_SUFFIX?=		-art
-CONFLICTS?=		gunstep-back-0.* gunstep-back-xdps-0.* gunstep-back-cairo-0.*
-.elif defined(WITH_GNUSTEP_CAIRO)
 CFLAGS+=		-I${LOCALBASE}/include/freetype2
-LIB_DEPENDS+=		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
+LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
 LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=	--enable-graphics=cairo --with-name=cairo
 CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=		BACK=cairo-${BACKVERSION}
-PLIST_SUB+=		WITH_XLIB="@comment "
 BACK_SUFFIX?=		-cairo
-CONFLICTS?=		gunstep-back-0.* gunstep-back-xdps-0.* gunstep-back-art-0.*
-.else
-CONFIGURE_ARGS+=	--enable-graphics=xlib --with-name=back
-CONFIGURE_ARGS+=	--disable-glitz
-PLIST_SUB+=		BACK=back-${BACKVERSION}
-PLIST_SUB+=		WITH_XLIB=""
-CONFLICTS?=		gunstep-back-xdps-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/gnustep-back/distinfo b/x11-toolkits/gnustep-back/distinfo
index 3109d1054a20..c0b9707b6dda 100644
--- a/x11-toolkits/gnustep-back/distinfo
+++ b/x11-toolkits/gnustep-back/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep-back-0.22.0.tar.gz) = b9bf26346737d87160af669c3073b4eb511c743056af90aedb631e1537513608
-SIZE (gnustep-back-0.22.0.tar.gz) = 935034
+SHA256 (gnustep-back-0.23.0.tar.gz) = 7e897849bf0359d2401a426c75bda89117b5506910892b4eb15262edfb26bbdc
+SIZE (gnustep-back-0.23.0.tar.gz) = 942380
diff --git a/x11-toolkits/gnustep-back/pkg-plist b/x11-toolkits/gnustep-back/pkg-plist
index 4105224ca261..bb0ffc4acde7 100644
--- a/x11-toolkits/gnustep-back/pkg-plist
+++ b/x11-toolkits/gnustep-back/pkg-plist
@@ -4,6 +4,11 @@ GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources/Swedish.lpro
 GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/libgnustep-%%BACK%%
 GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/stamp.make
 GNUstep/System/Library/Documentation/man/man1/gpbs.1.gz
+GNUstep/System/Tools/gpbs
+@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources/Swedish.lproj
+@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources/English.lproj
+@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources
+@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle
 GNUstep/System/Library/Fonts/Helvetica.nfont/FontInfo.plist
 GNUstep/System/Library/Fonts/Helvetica.nfont/n019003l.afm
 GNUstep/System/Library/Fonts/Helvetica.nfont/n019003l.pfb
@@ -29,10 +34,4 @@ GNUstep/System/Library/Fonts/Helvetica.nfont/n019063l.pfm
 GNUstep/System/Library/Fonts/Helvetica.nfont/n019064l.afm
 GNUstep/System/Library/Fonts/Helvetica.nfont/n019064l.pfb
 GNUstep/System/Library/Fonts/Helvetica.nfont/n019064l.pfm
-%%WITH_XLIB%%GNUstep/System/Tools/font_cacher
-GNUstep/System/Tools/gpbs
 @dirrm GNUstep/System/Library/Fonts/Helvetica.nfont
-@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources/Swedish.lproj
-@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources/English.lproj
-@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle/Resources
-@dirrm GNUstep/System/Library/Bundles/libgnustep-%%BACK%%.bundle