From owner-svn-ports-all@FreeBSD.ORG Thu Apr 9 07:45:02 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A2E9879; Thu, 9 Apr 2015 07:45:02 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83165770; Thu, 9 Apr 2015 07:45:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t397j2WN043724; Thu, 9 Apr 2015 07:45:02 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t397igI6043596; Thu, 9 Apr 2015 07:44:42 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201504090744.t397igI6043596@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 9 Apr 2015 07:44:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383626 - in head: . Mk Mk/Uses archivers/freetar archivers/zipper audio/cddb-bundle audio/gnustep-cdplayer audio/mpdcon biology/biococoa databases/fortytwo-bdb databases/sqlclient desk... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2015 07:45:02 -0000 Author: bapt Date: Thu Apr 9 07:44:41 2015 New Revision: 383626 URL: https://svnweb.freebsd.org/changeset/ports/383626 Log: Convert bsd.gnustep.mk to USES=gnustep Simplify gnustep ports Hook into the regular ports framework: - LIB_DEPENDS for library dependencies - Use regular USE_LDCONFIG Reuse USES=objc (automatic) USE_GNUSTEP is now a macro to set the dependencies and build feature needed. Accepted arguments: back base build gui Merge deskutils/preferencepanes into deskutils/systempreferences Added: head/Mk/Uses/gnustep.mk (contents, props changed) Deleted: head/Mk/bsd.gnustep.mk Modified: head/CHANGES head/MOVED head/archivers/freetar/Makefile head/archivers/zipper/Makefile head/audio/cddb-bundle/Makefile head/audio/gnustep-cdplayer/Makefile head/audio/mpdcon/Makefile head/biology/biococoa/Makefile head/databases/fortytwo-bdb/Makefile head/databases/sqlclient/Makefile head/deskutils/affiche/Makefile head/deskutils/appwrapper/Makefile head/deskutils/cartotheque/Makefile head/deskutils/displaycalibrator/Makefile head/deskutils/gnustep-notebook/Makefile head/deskutils/gnustep-wrapper/Makefile head/deskutils/gworkspace-gwmetadata/Makefile head/deskutils/gworkspace/Makefile head/deskutils/helpviewer/Makefile head/deskutils/plopfolio/Makefile head/deskutils/preferences/Makefile head/deskutils/preferences/pkg-descr head/deskutils/simpleagenda/Makefile head/deskutils/systempreferences/Makefile head/deskutils/systempreferences/pkg-descr head/deskutils/systempreferences/pkg-plist head/deskutils/toolboxkit/Makefile head/devel/fortytwo-encore/Makefile head/devel/gnustep-make/Makefile head/devel/gnustep-make/pkg-descr head/devel/gnustep/Makefile head/devel/gorm/Makefile head/devel/highlighterkit/Makefile head/devel/performance/Makefile head/devel/wizardkit/Makefile head/finance/expense/Makefile head/ftp/gnustep-ftp/Makefile head/ftp/waiho/Makefile head/games/fortunate/Makefile head/games/gmastermind/Makefile head/games/gmines/Makefile head/games/gnustep-ladder/Makefile head/games/gnustep-sudoku/Makefile head/games/grubik/Makefile head/games/gshisen/Makefile head/games/jigsaw/Makefile head/games/lapispuzzle/Makefile head/games/nextgo/Makefile head/graphics/camera/Makefile head/graphics/camerakit/Makefile head/graphics/cenon/Makefile head/graphics/fortytwo/Makefile head/graphics/gnustep-slideshow/Makefile head/graphics/gnustep-slideshowkit/Makefile head/graphics/imageviewer/Makefile head/graphics/laternamagica/Makefile head/graphics/pixen/Makefile head/graphics/preview/Makefile head/graphics/price/Makefile head/japanese/jishyo/Makefile head/lang/gnustep-base/Makefile head/lang/gnustep-base/pkg-descr head/lang/gscheme/Makefile head/mail/addresses-goodies/Makefile head/mail/addresses/Makefile head/mail/gnumail/Makefile head/mail/pantomime/Makefile head/math/edenmath/Makefile head/multimedia/poe/Makefile head/net/remotedesk/Makefile head/net/zillion/Makefile head/news/lusernet/Makefile head/print/gspdf/Makefile head/science/gtamsanalyzer/Makefile head/science/paje/Makefile head/sysutils/batmon/Makefile head/sysutils/timemon/Makefile head/textproc/duncan/Makefile head/textproc/easydiff/Makefile head/textproc/latex-service/Makefile head/textproc/localize/Makefile head/textproc/popup/Makefile head/x11-clocks/aclock/Makefile head/x11-toolkits/gnustep-back/Makefile head/x11-toolkits/gnustep-gui/Makefile head/x11/gnustep-app/Makefile head/x11/gskrab/Makefile head/x11/innerspace/Makefile head/x11/terminal.app/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Thu Apr 9 07:10:51 2015 (r383625) +++ head/CHANGES Thu Apr 9 07:44:41 2015 (r383626) @@ -10,6 +10,17 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20150409: +AUTHOR: bapt@FreeBSD.org + + Add a new USES=gnustep to handle the GNUstep ports. Now the dependencies on + GNUstep libraries is done via the regular LIB_DEPENDS + + USE_GNUSTEP is now a macro that accept many arguments: back, build, gui, back + Depending on the feature needed for a given port + + Reuse USES=objc to avoid duplicating code + 20150408: AUTHOR: bapt@FreeBSD.org Modified: head/MOVED ============================================================================== --- head/MOVED Thu Apr 9 07:10:51 2015 (r383625) +++ head/MOVED Thu Apr 9 07:44:41 2015 (r383626) @@ -7463,3 +7463,4 @@ sysutils/puppet27||2015-04-07|Has expire www/rubygem-form_data|www/rubygem-http-form_data|2015-04-07|Has expired: Use www/rubygem-http-form_data instead (renamed by upstream) www/typo345||2015-04-07|Has expired: Upgrade to www/typo3 or www/typo3-lts multimedia/mediabrowser|multimedia/emby-server|2015-04-08|Project renamed +deskutils/preferencepanes|multimedia/systempreferences|2015-04-08|preferencepanes merged into systempreferences Added: head/Mk/Uses/gnustep.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/gnustep.mk Thu Apr 9 07:44:41 2015 (r383626) @@ -0,0 +1,79 @@ +# $FreeBSD$ +# +# Handle GNUstep related ports +# +# Feature: gnustep +# Usage: USES=gnustep +# +# Defined specific dependencies under USE_GNUSTEP +# Expected arguments for USE_GNUSTEP: +# +# base: depends on the gnustep-base port +# gui: depends on the gnustep-gui port +# back: depends on the gnustep-back port +# build: prepare the build dependencies for a regular GNUstep port +# + +.if !defined(_INCLUDE_USES_GNUSTEP_MK) +_INCLUDE_USES_GNUSTEP_MK= yes +.include "${USESDIR}/gmake.mk" + +GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep +DEFAULT_LIBVERSION?= 0.0.1 + +GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_PREFIX}/System +GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles +GNUSTEP_SYSTEM_LIBRARIES= ${GNUSTEP_SYSTEM_ROOT}/Library/Libraries +GNUSTEP_SYSTEM_TOOLS= ${GNUSTEP_SYSTEM_ROOT}/Tools + +GNUSTEP_LOCAL_ROOT= ${GNUSTEP_PREFIX}/Local +GNUSTEP_LOCAL_LIBRARIES= ${GNUSTEP_LOCAL_ROOT}/Library/Libraries +GNUSTEP_LOCAL_TOOLS= ${GNUSTEP_LOCAL_ROOT}/Tools + +LIB_DIRS+= ${GNUSTEP_SYSTEM_LIBRARIES} \ + ${GNUSTEP_LOCAL_LIBRARIES} + +.for a in FLAGS CFLAGS CPPFLAGS OBJCFLAGS INCLUDE_DIRS LDFLAGS LIB_DIRS +MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}}" +.endfor + +MAKEFILE= GNUmakefile +#MAKE_ENV+= GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf +GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX} + +.if ${MACHINE_ARCH} == "i386" +GNU_ARCH= ix86 +.else +GNU_ARCH= ${MACHINE_ARCH} +.endif + +PLIST_SUB+= GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION} +PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} +PLIST_SUB+= LIBVERSION=${DEFAULT_LIBVERSION} +PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1} + +.if defined(USE_GNUSTEP) +. if ${USE_GNUSTEP:Mbase} +LIB_DEPENDS+= libgnustep-base.so:${PORTSDIR}/lang/gnustep-base +. endif + +. if ${USE_GNUSTEP:Mbuild} +PATH:= ${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}:${PATH} +MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +BUILD_DEPENDS+= gnustep-make>0:${PORTSDIR}/devel/gnustep-make +.include "${USESDIR}/objc.mk" +. endif + +. if ${USE_GNUSTEP:Mgui} +LIB_DEPENDS+= libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui +. endif + +. if ${USE_GNUSTEP:Mback} +BUILD_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back +RUN_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back +. endif + +.endif + +.endif Modified: head/archivers/freetar/Makefile ============================================================================== --- head/archivers/freetar/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/archivers/freetar/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= TAR archiver for GNUstep LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/FreeTar_1_1_1_Source Modified: head/archivers/zipper/Makefile ============================================================================== --- head/archivers/zipper/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/archivers/zipper/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ DISTNAME= Zipper-${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= Tool for inspecting the contents of a compressed archive -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: cd ${WRKSRC} && ${FIND} . -name "*#*" -exec ${RM} -f -v "{}" ";" Modified: head/audio/cddb-bundle/Makefile ============================================================================== --- head/audio/cddb-bundle/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/audio/cddb-bundle/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,11 +14,8 @@ COMMENT= CDDB client bundle GNUstep LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build CDPLAYER_VERSION= 0.5.1 WRKSRC= ${WRKDIR}/CDPlayer-${CDPLAYER_VERSION}/Cddb Modified: head/audio/gnustep-cdplayer/Makefile ============================================================================== --- head/audio/gnustep-cdplayer/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/audio/gnustep-cdplayer/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,22 +13,18 @@ COMMENT= GNUstep CD player with CDDB sup LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libcdaudio.so:${PORTSDIR}/audio/libcdaudio +LIB_DEPENDS= libcdaudio.so:${PORTSDIR}/audio/libcdaudio \ + libPrefsModule.so:${PORTSDIR}/deskutils/preferences -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:${CDDB_BUNDLE_PORT} -USE_GNUSTEP_SYSTEM_LIBS+= PrefsModule:${PREFERENCES_PORT} +BUILD_DEPENDS= cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle +RUN_DEPENDS= cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle + +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/CDPlayer-${PORTVERSION} MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT} -CDDB_BUNDLE_PORT?= audio/cddb-bundle -PREFERENCES_PORT?= deskutils/preferences - post-install: ${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Bundles/AudioCD.bundle/AudioCD \ Modified: head/audio/mpdcon/Makefile ============================================================================== --- head/audio/mpdcon/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/audio/mpdcon/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,13 +13,11 @@ COMMENT= MPD client for GNUstep LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= SQLClient:databases/sqlclient +USES= gnustep +USE_GNUSTEP= base gui back build -LIB_DEPENDS+= libmpdclient.so.2:${PORTSDIR}/audio/libmpdclient +LIB_DEPENDS= libmpdclient.so.2:${PORTSDIR}/audio/libmpdclient \ + libSQLClient.so:${PORTSDIR}/databases/sqlclient post-patch: ${REINPLACE_CMD} -e \ Modified: head/biology/biococoa/Makefile ============================================================================== --- head/biology/biococoa/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/biology/biococoa/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,10 +14,8 @@ COMMENT= Bioinformatics framework LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/biococoa-${PORTVERSION} Modified: head/databases/fortytwo-bdb/Makefile ============================================================================== --- head/databases/fortytwo-bdb/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/databases/fortytwo-bdb/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,22 +14,19 @@ COMMENT= Interface to Berkeley DB for GN LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Encore:${ENCORE_PORT} +USES= gnustep +USE_GNUSTEP= back build + +LIB_DEPENDS= libEncore.so:${PORTSDIR}/devel/fortytwo-encore DEFAULT_LIBVERSION= 0.1 -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} USE_BDB= 43+ WRKSRC= ${WRKDIR}/BDB-${PORTVERSION} DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB -ADDITIONAL_OBJCFLAGS+= -I${BDB_INCLUDE_DIR} +ADDITIONAL_OBJCFLAGS+= -I${BDB_INCLUDE_DIR} -I${GNUSTEP_PREFIX}/ ADDITIONAL_LDFLAGS+= -L${BDB_LIB_DIR} -ENCORE_PORT?= devel/fortytwo-encore - OPTIONS_DEFINE= DOCS post-install: Modified: head/databases/sqlclient/Makefile ============================================================================== --- head/databases/sqlclient/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/databases/sqlclient/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,24 +13,20 @@ COMMENT= Lightweight database abstractio LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Performance:${PERFORMANCE_PORT} -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USES+= pgsql +LIB_DEPENDS= libPerformance.so:${PORTSDIR}/devel/performance \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 + +USES= gnustep pgsql +USE_GNUSTEP= base build +GNU_CONFIGURE= yes +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} USE_MYSQL=yes -USE_SQLITE=yes -LDFLAGS+= -lpthread +LDFLAGS+= -pthread MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT} DEFAULT_LIBVERSION= 1.5 DEFAULT_LIBVERSION2= 1.5.0 PLIST_SUB+= LIBVERSION2=${DEFAULT_LIBVERSION2} PLIST_SUB+= MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1} -PERFORMANCE_PORT?= devel/performance - .include Modified: head/deskutils/affiche/Makefile ============================================================================== --- head/deskutils/affiche/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/affiche/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= Affiche allows people to stick LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Affiche Modified: head/deskutils/appwrapper/Makefile ============================================================================== --- head/deskutils/appwrapper/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/appwrapper/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= GNUstep application wrapper LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/AppWrapper Modified: head/deskutils/cartotheque/Makefile ============================================================================== --- head/deskutils/cartotheque/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/cartotheque/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,10 +13,8 @@ COMMENT= Managing notes on small cards LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Modified: head/deskutils/displaycalibrator/Makefile ============================================================================== --- head/deskutils/displaycalibrator/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/displaycalibrator/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -9,10 +9,7 @@ MASTER_SITES= http://gnu.ethz.ch/linuks. MAINTAINER= ports@FreeBSD.org COMMENT= Frontend to xgamma -BROKEN= Unfetchable -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build .include Modified: head/deskutils/gnustep-notebook/Makefile ============================================================================== --- head/deskutils/gnustep-notebook/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/gnustep-notebook/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,10 +14,7 @@ COMMENT= Place to store notes in an orga LICENSE= GPLv2 -BROKEN= Unfetchable -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build .include Modified: head/deskutils/gnustep-wrapper/Makefile ============================================================================== --- head/deskutils/gnustep-wrapper/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/gnustep-wrapper/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -15,11 +15,9 @@ COMMENT= Create GNUstep app-wrappers of LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/libGSWrapper/obj MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Modified: head/deskutils/gworkspace-gwmetadata/Makefile ============================================================================== --- head/deskutils/gworkspace-gwmetadata/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/gworkspace-gwmetadata/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -2,7 +2,7 @@ PORTNAME= gworkspace PORTVERSION= 0.9.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnustep #MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/ MASTER_SITES= ${MASTER_SITE_GNUSTEP} @@ -14,14 +14,12 @@ COMMENT= GWMetadata for GNUstep workspac LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_SYSTEM_LIBS+= DBKit:${GWORKSPACE_PORT} -USE_GNUSTEP_SYSTEM_LIBS+= PreferencePanes:${PREFERENCEPANES_PORT} -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +GNU_CONFIGURE= yes +LIB_DEPENDS= libDBKit.so:${PORTSDIR}/deskutils/gworkspace \ + libPreferencePanes.so:${PORTSDIR}/deskutils/systempreferences +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_SQLITE= yes LDFLAGS+= -lpthread @@ -33,9 +31,6 @@ CONFIGURE_ARGS+= --with-sqlite-library=$ DEFAULT_LIBVERSION= 0.1.0 MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -GWORKSPACE_PORT?= deskutils/gworkspace -PREFERENCEPANES_PORT?= deskutils/preferencepanes - post-patch: ${CP} ${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile.in \ ${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile Modified: head/deskutils/gworkspace/Makefile ============================================================================== --- head/deskutils/gworkspace/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/gworkspace/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,12 +13,9 @@ COMMENT= GNUstep workspace manager LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} GNU_CONFIGURE= yes ADDITIONAL_LDFLAGS+= -L${WRKSRC}/FSNode/FSNode.framework/Versions/A Modified: head/deskutils/helpviewer/Makefile ============================================================================== --- head/deskutils/helpviewer/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/helpviewer/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,10 +13,8 @@ COMMENT= Online help viewer for GNUstep LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build FIXME= HandlerStructureXLP.h TextFormatterXLP.h Modified: head/deskutils/plopfolio/Makefile ============================================================================== --- head/deskutils/plopfolio/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/plopfolio/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= Free clone of KlipFolio for GNU LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build FIXME= Channel.m PlopFolio.m PreferencesPanelController.m Modified: head/deskutils/preferences/Makefile ============================================================================== --- head/deskutils/preferences/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/preferences/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,12 +13,9 @@ COMMENT= GNUstep workspace manager LICENSE_COMB= multi LICENSE= GPLv2 LGPL21 -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} DEAFULT_LIBVERSION= 1.1.1 MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Modified: head/deskutils/preferences/pkg-descr ============================================================================== --- head/deskutils/preferences/pkg-descr Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/preferences/pkg-descr Thu Apr 9 07:44:41 2015 (r383626) @@ -7,7 +7,4 @@ developers did not think of or even inte recompiling the main program. For more information on what bundles can do, see StepWise. They are a very powerful tool. -LICENSE: LGPL2 or later (framework) -LICENSE: GPL2 or later (application) - WWW: http://www.nongnu.org/backbone/ Modified: head/deskutils/simpleagenda/Makefile ============================================================================== --- head/deskutils/simpleagenda/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/simpleagenda/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,11 +14,9 @@ LIB_DEPENDS+= libical.so:${PORTSDIR}/dev LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include Modified: head/deskutils/systempreferences/Makefile ============================================================================== --- head/deskutils/systempreferences/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/systempreferences/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -2,7 +2,7 @@ PORTNAME= systempreferences PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR=usr-apps @@ -13,15 +13,11 @@ COMMENT= System Preferences application LICENSE= GPLv2 -PREFERENCEPANES_PORT?= deskutils/preferencepanes +USES= gnustep +USE_GNUSTEP= back build +DEFAULT_LIBVERSION= 1.0.0 +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} -USE_GNUSTEP= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_SYSTEM_LIBS+= PreferencePanes:${PREFERENCEPANES_PORT} - -USE_GNUSTEP_MAKE_DIRS= SystemPreferences Modules MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM .include Modified: head/deskutils/systempreferences/pkg-descr ============================================================================== --- head/deskutils/systempreferences/pkg-descr Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/systempreferences/pkg-descr Thu Apr 9 07:44:41 2015 (r383626) @@ -2,6 +2,4 @@ System Preferences is a clone of the App application based on a GNUstep implementation of the PreferencePanes framework. -LICENSE: GPL2 or later - WWW: http://www.gnustep.org/experience/systempreferences.html Modified: head/deskutils/systempreferences/pkg-plist ============================================================================== --- head/deskutils/systempreferences/pkg-plist Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/systempreferences/pkg-plist Thu Apr 9 07:44:41 2015 (r383626) @@ -71,3 +71,19 @@ GNUstep/System/Library/Bundles/InternetM GNUstep/System/Library/Bundles/InternetModule.prefPane/Resources/English.lproj/InternetModule.gorm/data.classes GNUstep/System/Library/Bundles/InternetModule.prefPane/Resources/English.lproj/InternetModule.gorm/data.info GNUstep/System/Library/Bundles/InternetModule.prefPane/Resources/English.lproj/InternetModule.gorm/objects.gorm +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Headers +GNUstep/System/Library/Frameworks/PreferencePanes.framework/PreferencePanes +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Resources +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSPreferencePane.h +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Headers/PreferencePanes.h +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/PreferencePanes +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/libPreferencePanes.so +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/libPreferencePanes.so.%%MAJORLIBVERSION%% +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/%%MAJORLIBVERSION%%/libPreferencePanes.so.%%LIBVERSION%% +GNUstep/System/Library/Frameworks/PreferencePanes.framework/Versions/Current +GNUstep/System/Library/Frameworks/PreferencePanes.framework/libPreferencePanes.so +GNUstep/System/Library/Headers/PreferencePanes +GNUstep/System/Library/Libraries/libPreferencePanes.so +GNUstep/System/Library/Libraries/libPreferencePanes.so.%%MAJORLIBVERSION%% +GNUstep/System/Library/Libraries/libPreferencePanes.so.%%LIBVERSION%% Modified: head/deskutils/toolboxkit/Makefile ============================================================================== --- head/deskutils/toolboxkit/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/deskutils/toolboxkit/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -5,8 +5,7 @@ PORTVERSION= 0.8 PORTREVISION= 3 CATEGORIES= deskutils gnustep MASTER_SITES= http://ftp.azc.uam.mx/mirrors/gnu/savannah/files/toolbox/Release.pkg/0.8/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= dinoex + LOCAL/dinoex PKGNAMESUFFIX= kit${PKGNAMESUFFIX2} DISTNAME= Toolbox-${PORTVERSION} @@ -15,13 +14,10 @@ LICENSE= GPLv2 MAINTAINER= ports@FreeBSD.org COMMENT= Toolbox bundle for GNUstep -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -WRKSRC= ${WRKDIR}/Toolbox -USE_GNUSTEP_MAKE_DIRS+= Toolbox +WRKSRC= ${WRKDIR}/Toolbox/Toolbox .include Modified: head/devel/fortytwo-encore/Makefile ============================================================================== --- head/devel/fortytwo-encore/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/fortytwo-encore/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -15,12 +15,10 @@ COMMENT= Utility classes for GNUstep LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build DEFAULT_LIBVERSION= 0.1 -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} WRKSRC= ${WRKDIR}/Encore DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/Encore Modified: head/devel/gnustep-make/Makefile ============================================================================== --- head/devel/gnustep-make/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/gnustep-make/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -3,17 +3,16 @@ PORTNAME= gnustep-make PORTVERSION= 2.6.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnustep -MASTER_SITES= ${MASTER_SITE_GNUSTEP} -MASTER_SITE_SUBDIR= core +MASTER_SITES= GNUSTEP/core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep makefile package LICENSE= GPLv3 -USE_GNUSTEP= yes +USES= gnustep GNU_CONFIGURE= yes MAKE_FLAGS= OPTFLAG="${CFLAGS}" @@ -22,13 +21,7 @@ CONFIGURE_ARGS+= --with-thread-lib=-pthr CONFIGURE_ARGS+= --with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf CONFIGURE_ARGS+= --with-layout=gnustep CONFIGURE_ARGS+= --enable-objc-nonfragile-abi --enable-native-objc-exceptions -LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX} -LIB_DEPENDS+= libobjc.so:${PORTSDIR}/lang/libobjc2 - -post-patch: - ${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \ - ${WRKSRC}/configure post-install: ${LN} -s Library/Makefiles ${STAGEDIR}${GNUSTEP_PREFIX}/System/ Modified: head/devel/gnustep-make/pkg-descr ============================================================================== --- head/devel/gnustep-make/pkg-descr Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/gnustep-make/pkg-descr Thu Apr 9 07:44:41 2015 (r383626) @@ -6,6 +6,4 @@ arrays, to GUI interface classes such as Please contact the GNUstep maintainers at in case of questions and help offers. -LICENSE: GPL3 - WWW: http://www.gnustep.org/ Modified: head/devel/gnustep/Makefile ============================================================================== --- head/devel/gnustep/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/gnustep/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -5,23 +5,11 @@ PORTNAME= gnustep PORTVERSION= 1.28.0 PORTREVISION= 2 CATEGORIES= devel lang gnustep -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty MAINTAINER= theraven@FreeBSD.org COMMENT= Objective-C libraries based on the OpenStep standard -# Backends are slave ports with conflicting plists -WITH_GNUSTEP_SINGLE_BACKEND=yes - -NO_BUILD= yes -NO_INSTALL= yes -NO_MTREE= yes - -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_GUI= yes -USE_GNUSTEP_BACK= yes +USES= metaport gnustep +USE_GNUSTEP= back gui base .include Modified: head/devel/gorm/Makefile ============================================================================== --- head/devel/gorm/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/gorm/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,11 +12,9 @@ COMMENT= Graphical Object Relationship M LICENSE= GPLv3 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} DEFAULT_LIBVERSION= 1.1.0 MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Modified: head/devel/highlighterkit/Makefile ============================================================================== --- head/devel/highlighterkit/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/highlighterkit/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -10,11 +10,8 @@ DISTNAME= HighlighterKit-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Framework needed by Project Manager -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} .include Modified: head/devel/performance/Makefile ============================================================================== --- head/devel/performance/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/performance/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -4,8 +4,7 @@ PORTNAME= performance PORTVERSION= 0.4.0 PORTREVISION= 1 CATEGORIES= devel gnustep -MASTER_SITES= ${MASTER_SITE_GNUSTEP} -MASTER_SITE_SUBDIR= libs +MASTER_SITES= GNUSTEP/libs DISTNAME= Performance-${PORTVERSION} MAINTAINER= theraven@FreeBSD.org @@ -13,10 +12,8 @@ COMMENT= Help improve the performance of LICENSE= LGPL3 -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= base build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} .include Modified: head/devel/wizardkit/Makefile ============================================================================== --- head/devel/wizardkit/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/devel/wizardkit/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,12 +13,9 @@ COMMENT= Framework needed by Project Man LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/0/libWizardKit.so Modified: head/finance/expense/Makefile ============================================================================== --- head/finance/expense/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/finance/expense/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= Application to track your expen LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Expense Modified: head/ftp/gnustep-ftp/Makefile ============================================================================== --- head/ftp/gnustep-ftp/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/ftp/gnustep-ftp/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,10 +14,8 @@ COMMENT= Compact and handy FTP client fo LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Modified: head/ftp/waiho/Makefile ============================================================================== --- head/ftp/waiho/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/ftp/waiho/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,11 +13,8 @@ COMMENT= Simple FTP client for GNUstep LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:tgz -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:tgz gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Waiho.app/Waiho Modified: head/games/fortunate/Makefile ============================================================================== --- head/games/fortunate/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/fortunate/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -9,11 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH} MAINTAINER= ports@FreeBSD.org COMMENT= Graphical front-end to the command-line BSD fortune -BROKEN= No public distfiles - -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build .include Modified: head/games/gmastermind/Makefile ============================================================================== --- head/games/gmastermind/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/gmastermind/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,10 +13,8 @@ COMMENT= Well-known mastermind game LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/GMastermind.app/GMastermind Modified: head/games/gmines/Makefile ============================================================================== --- head/games/gmines/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/gmines/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= Well-known minesweeper game for LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/GMines.app/GMines Modified: head/games/gnustep-ladder/Makefile ============================================================================== --- head/games/gnustep-ladder/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/gnustep-ladder/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -17,10 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.GPL RUN_DEPENDS= gnugo:${PORTSDIR}/games/gnugo -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Ladder.app/Ladder Modified: head/games/gnustep-sudoku/Makefile ============================================================================== --- head/games/gnustep-sudoku/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/gnustep-sudoku/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,10 +13,8 @@ COMMENT= Sudoku solver and generator LICENSE= GPLv3 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Sudoku.app/Sudoku Modified: head/games/grubik/Makefile ============================================================================== --- head/games/grubik/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/grubik/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,11 +12,8 @@ COMMENT= Virtual 3D Rubiks cube for GNUs LICENSE= GPLv2 # or later -USES= tar:tgz tar:tgz -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:tgz gnustep +USE_GNUSTEP= back build MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Modified: head/games/gshisen/Makefile ============================================================================== --- head/games/gshisen/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/gshisen/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,10 +13,8 @@ COMMENT= Shisen-sho puzzle game for GNUs LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Modified: head/games/jigsaw/Makefile ============================================================================== --- head/games/jigsaw/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/jigsaw/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,10 +12,8 @@ COMMENT= Simulates a jigsaw puzzle and i LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Jigsaw.app/Jigsaw Modified: head/games/lapispuzzle/Makefile ============================================================================== --- head/games/lapispuzzle/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/lapispuzzle/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -14,10 +14,8 @@ COMMENT= Tetris-like game for GNUstep LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/LapisPuzzle-${PORTVERSION} Modified: head/games/nextgo/Makefile ============================================================================== --- head/games/nextgo/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/games/nextgo/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -13,10 +13,8 @@ COMMENT= Classic Go game for OPENSTEP/GN LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Modified: head/graphics/camera/Makefile ============================================================================== --- head/graphics/camera/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/graphics/camera/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -16,11 +16,8 @@ LICENSE_FILE= ${WRKSRC}/Documentation/CO LIB_DEPENDS= libgphoto2_port.so:${PORTSDIR}/graphics/libgphoto2 -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Camera Modified: head/graphics/camerakit/Makefile ============================================================================== --- head/graphics/camerakit/Makefile Thu Apr 9 07:10:51 2015 (r383625) +++ head/graphics/camerakit/Makefile Thu Apr 9 07:44:41 2015 (r383626) @@ -12,12 +12,9 @@ COMMENT= Framework that allows to access LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***