[Midnightbsd-cvs] mports: Makefile: Portlint fixes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Portlint fixes.  Remove redundant pull in of Xft.  Explicitly set imake port since we don't have multple x versions anyway.

Modified Files:
--------------
    mports/x11-toolkits/gnustep-back:
        Makefile (r1.7 -> r1.8)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gnustep-back/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L x11-toolkits/gnustep-back/Makefile -L x11-toolkits/gnustep-back/Makefile -u -r1.7 -r1.8
--- x11-toolkits/gnustep-back/Makefile
+++ x11-toolkits/gnustep-back/Makefile
@@ -12,7 +12,6 @@
 .else
 PORTVERSION=  0.12.1
 .endif
-PORTREVISION=	0
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -22,13 +21,12 @@
 COMMENT=	GNUstep GUI backend
 LICENSE=	gpl3
 
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_XORG=	xft xrender xmu xext x11
-USE_FREETYPE=	yes
+USE_XORG=		xft xrender xmu xext x11
+USE_FREETYPE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
@@ -37,7 +35,7 @@
 CONFIGURE_ARGS+=	--with-jpeg-include=${LOCALBASE}/include
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_GMAKE=		yes
-USE_GNUSTEP=	yes
+USE_GNUSTEP=		yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_CONFIGURE=	yes
@@ -50,9 +48,9 @@
 
 .if defined(WITH_GNUSTEP_XDPS)
 GNUSTEP_DGS_PORT?=	x11/dgs
-BUILD_DEPENDS+=		imake:${X_IMAKE_PORT}
-BUILD_DEPENDS+=		dgs:${PORTSDIR}/${GNUSTEP_DGS_PORT}
-LIB_DEPENDS+=		dpstk:${PORTSDIR}/${GNUSTEP_DGS_PORT}
+BUILD_DEPENDS+=		imake:${PORTSDIR}/devel/imake
+BUILD_DEPENDS+=		dgs:${PORTSDIR}/x11/dgs
+LIB_DEPENDS+=		dpstk:${PORTSDIR}/x11/dgs
 CONFIGURE_ARGS+=	--enable-graphics=xdps --with-name=xdps
 CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=		BACK=xdps-${BACKVERSION}
@@ -94,7 +92,6 @@
 MAKE_FLAGS+=		messages=yes
 PLIST_SUB+=		BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
 
-
 pre-configure:
 .for file in config.guess config.sub install-sh
 	@${CP} ${PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}