From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 08:31:57 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F5DCCA0; Tue, 28 Jan 2014 08:31:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 49A1314C4; Tue, 28 Jan 2014 08:31:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0S8VvlO074650; Tue, 28 Jan 2014 08:31:57 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0S8Vu5M074648; Tue, 28 Jan 2014 08:31:56 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401280831.s0S8Vu5M074648@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 28 Jan 2014 08:31:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341513 - head/x11-toolkits/gnustep-gui X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 08:31:57 -0000 Author: bapt Date: Tue Jan 28 08:31:56 2014 New Revision: 341513 URL: http://svnweb.freebsd.org/changeset/ports/341513 QAT: https://qat.redports.org/buildarchive/r341513/ Log: Support stage Use options framework and options helpers Stop automatically linking on cups or aspell if they are installed but do it when the options is checked Use modern LIB_DEPENDS This port would need way more cleanup :( Modified: head/x11-toolkits/gnustep-gui/Makefile head/x11-toolkits/gnustep-gui/pkg-plist Modified: head/x11-toolkits/gnustep-gui/Makefile ============================================================================== --- head/x11-toolkits/gnustep-gui/Makefile Tue Jan 28 08:17:13 2014 (r341512) +++ head/x11-toolkits/gnustep-gui/Makefile Tue Jan 28 08:31:56 2014 (r341513) @@ -10,21 +10,24 @@ MASTER_SITE_SUBDIR= core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep GUI library -.if !defined(NOPORTDOCS) -BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -BUILD_DEPENDS+= texi2pdf:${PORTSDIR}/print/texinfo -.endif -LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile -LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao -BUILD_DEPENDS+= ${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite - LICENSE_COMB= multi LICENSE= GPLv3 LGPL3 +OPTIONS_DEFINE= DOCS CUPS ASPELL +OPTIONS_DEFAULT= CUPS +OPTIONS_SUB= yes + +DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html \ + texi2pdf:${PORTSDIR}/print/texinfo + +LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png +LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib +LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS+= libao.so:${PORTSDIR}/audio/libao +BUILD_DEPENDS+= ${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include @@ -42,7 +45,6 @@ USE_GNUSTEP_INSTALL= yes USE_GNUSTEP_BASE= yes USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_XORG= x11 xt -NOPORTDOCS= dvi2pdf broken EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.speech.patch @@ -50,35 +52,23 @@ EXTRA_PATCHES+= ${FILESDIR}/AudioOutputS MAKE_FLAGS+= OPTFLAG="${CFLAGS}" MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM BREAKS_IF_PEDANTIC= yes + PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include/libpng15 -.if !defined(WITHOUT_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client -PLIST_SUB+= WITH_CUPS="" -.else -PLIST_SUB+= WITH_CUPS="@comment " -.endif - -ASPELL_PORT?= textproc/aspell -.if !defined(WITHOUT_ASPELL) -LIB_DEPENDS+= aspell:${PORTSDIR}/${ASPELL_PORT} -PLIST_SUB+= WITH_ASPELL="" -.else -PLIST_SUB+= WITH_ASPELL="@comment " -.endif +CUPS_CONFIGURE_ENABLE= cups +CUPS_LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_CONFIGURE_ENABLE= aspell -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure + ${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile pre-configure: .for file in config.guess config.sub install-sh @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} .endfor -.if !defined(NOPORTDOCS) - ${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile -.endif .include Modified: head/x11-toolkits/gnustep-gui/pkg-plist ============================================================================== --- head/x11-toolkits/gnustep-gui/pkg-plist Tue Jan 28 08:17:13 2014 (r341512) +++ head/x11-toolkits/gnustep-gui/pkg-plist Tue Jan 28 08:31:56 2014 (r341513) @@ -5,9 +5,9 @@ GNUstep/System/Applications/GSSpeechServ GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make -%%WITH_CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS -%%WITH_CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources/Info-gnustep.plist -%%WITH_CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/stamp.make +%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS +%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources/Info-gnustep.plist +%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/stamp.make GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make @@ -69,6 +69,7 @@ GNUstep/System/Library/ColorPickers/Whee %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/General.igsdoc %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/OpenStepCompliance.html %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/dependencies +%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit.pdf %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit.html %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_1.html %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_10.html @@ -866,8 +867,8 @@ GNUstep/System/Library/Images/common_Inf @dirrm GNUstep/System/Library/Bundles/Sndfile.nssound @dirrm GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources @dirrm GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle -%%WITH_CUPS%%@dirrm GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources -%%WITH_CUPS%%@dirrm GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle +%%CUPS%%@dirrm GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources +%%CUPS%%@dirrm GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle @dirrm GNUstep/System/Library/Bundles/GSPrinting @dirrm GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources @dirrm GNUstep/System/Library/Bundles/AudioOutput.nssound