From 5eb2b3a0170f23d67fc4902fecdad89b1577af1a Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 28 Jan 2014 08:34:57 +0000 Subject: [PATCH] Support stage Use modern LIB_DEPENDS A bit of cosmetic changes --- x11-toolkits/gnustep-back/Makefile | 38 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index 34b868925896..05e2cdd31220 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -11,23 +11,27 @@ PKGNAMESUFFIX?= ${BACK_SUFFIX}${PKGNAMESUFFIX2} 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 -LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 - LICENSE_COMB= multi LICENSE= GPLv3 LGPL3 +LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libXft.so:${PORTSDIR}/x11-fonts/libXft \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libcairo.so:${PORTSDIR}/graphics/cairo + GNU_CONFIGURE= yes -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 -CONFIGURE_ARGS+= --with-gif-library=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-gif-include=${LOCALBASE}/include +CONFIGURE_ARGS= --with-tiff-library=${LOCALBASE}/lib \ + --with-tiff-include=${LOCALBASE}/include \ + --with-jpeg-library=${LOCALBASE}/lib \ + --with-jpeg-include=${LOCALBASE}/include \ + --with-gif-library=${LOCALBASE}/lib \ + --with-gif-include=${LOCALBASE}/include \ + --enable-graphics=cairo \ + --disable-glitz + USES= pkgconfig USE_GNUSTEP= yes USE_GNUSTEP_GUI= yes @@ -43,14 +47,8 @@ BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} BREAKS_IF_PEDANTIC= yes CFLAGS+= -I${LOCALBASE}/include/freetype2 -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo -CONFIGURE_ARGS+= --enable-graphics=cairo -CONFIGURE_ARGS+= --disable-glitz PLIST_SUB+= BACK=back-${BACKVERSION} -.include - PLIST_SUB+= BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} pre-configure: @@ -58,4 +56,4 @@ pre-configure: @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} .endfor -.include +.include