aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES11
-rw-r--r--MOVED1
-rw-r--r--Mk/Uses/gnustep.mk79
-rw-r--r--Mk/bsd.gnustep.mk448
-rw-r--r--archivers/freetar/Makefile6
-rw-r--r--archivers/zipper/Makefile6
-rw-r--r--audio/cddb-bundle/Makefile7
-rw-r--r--audio/gnustep-cdplayer/Makefile18
-rw-r--r--audio/mpdcon/Makefile10
-rw-r--r--biology/biococoa/Makefile6
-rw-r--r--databases/fortytwo-bdb/Makefile15
-rw-r--r--databases/sqlclient/Makefile20
-rw-r--r--deskutils/affiche/Makefile6
-rw-r--r--deskutils/appwrapper/Makefile6
-rw-r--r--deskutils/cartotheque/Makefile6
-rw-r--r--deskutils/displaycalibrator/Makefile7
-rw-r--r--deskutils/gnustep-notebook/Makefile7
-rw-r--r--deskutils/gnustep-wrapper/Makefile8
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile19
-rw-r--r--deskutils/gworkspace/Makefile9
-rw-r--r--deskutils/helpviewer/Makefile6
-rw-r--r--deskutils/plopfolio/Makefile6
-rw-r--r--deskutils/preferences/Makefile9
-rw-r--r--deskutils/preferences/pkg-descr3
-rw-r--r--deskutils/simpleagenda/Makefile8
-rw-r--r--deskutils/systempreferences/Makefile14
-rw-r--r--deskutils/systempreferences/pkg-descr2
-rw-r--r--deskutils/systempreferences/pkg-plist16
-rw-r--r--deskutils/toolboxkit/Makefile14
-rw-r--r--devel/fortytwo-encore/Makefile8
-rw-r--r--devel/gnustep-make/Makefile13
-rw-r--r--devel/gnustep-make/pkg-descr2
-rw-r--r--devel/gnustep/Makefile16
-rw-r--r--devel/gorm/Makefile8
-rw-r--r--devel/highlighterkit/Makefile9
-rw-r--r--devel/performance/Makefile11
-rw-r--r--devel/wizardkit/Makefile9
-rw-r--r--finance/expense/Makefile6
-rw-r--r--ftp/gnustep-ftp/Makefile6
-rw-r--r--ftp/waiho/Makefile7
-rw-r--r--games/fortunate/Makefile8
-rw-r--r--games/gmastermind/Makefile6
-rw-r--r--games/gmines/Makefile6
-rw-r--r--games/gnustep-ladder/Makefile6
-rw-r--r--games/gnustep-sudoku/Makefile6
-rw-r--r--games/grubik/Makefile7
-rw-r--r--games/gshisen/Makefile6
-rw-r--r--games/jigsaw/Makefile6
-rw-r--r--games/lapispuzzle/Makefile6
-rw-r--r--games/nextgo/Makefile6
-rw-r--r--graphics/camera/Makefile7
-rw-r--r--graphics/camerakit/Makefile9
-rw-r--r--graphics/cenon/Makefile7
-rw-r--r--graphics/fortytwo/Makefile13
-rw-r--r--graphics/gnustep-slideshow/Makefile11
-rw-r--r--graphics/gnustep-slideshowkit/Makefile8
-rw-r--r--graphics/imageviewer/Makefile6
-rw-r--r--graphics/laternamagica/Makefile6
-rw-r--r--graphics/pixen/Makefile7
-rw-r--r--graphics/preview/Makefile6
-rw-r--r--graphics/price/Makefile11
-rw-r--r--japanese/jishyo/Makefile6
-rw-r--r--lang/gnustep-base/Makefile25
-rw-r--r--lang/gnustep-base/pkg-descr3
-rw-r--r--lang/gscheme/Makefile6
-rw-r--r--mail/addresses-goodies/Makefile19
-rw-r--r--mail/addresses/Makefile11
-rw-r--r--mail/gnumail/Makefile12
-rw-r--r--mail/pantomime/Makefile8
-rw-r--r--math/edenmath/Makefile6
-rw-r--r--multimedia/poe/Makefile6
-rw-r--r--net/remotedesk/Makefile6
-rw-r--r--net/zillion/Makefile6
-rw-r--r--news/lusernet/Makefile10
-rw-r--r--print/gspdf/Makefile9
-rw-r--r--science/gtamsanalyzer/Makefile6
-rw-r--r--science/paje/Makefile6
-rw-r--r--sysutils/batmon/Makefile6
-rw-r--r--sysutils/timemon/Makefile6
-rw-r--r--textproc/duncan/Makefile6
-rw-r--r--textproc/easydiff/Makefile6
-rw-r--r--textproc/latex-service/Makefile7
-rw-r--r--textproc/localize/Makefile6
-rw-r--r--textproc/popup/Makefile6
-rw-r--r--x11-clocks/aclock/Makefile6
-rw-r--r--x11-toolkits/gnustep-back/Makefile31
-rw-r--r--x11-toolkits/gnustep-gui/Makefile14
-rw-r--r--x11/gnustep-app/Makefile175
-rw-r--r--x11/gskrab/Makefile8
-rw-r--r--x11/innerspace/Makefile6
-rw-r--r--x11/terminal.app/Makefile6
91 files changed, 423 insertions, 1033 deletions
diff --git a/CHANGES b/CHANGES
index c3033871da8a..4d9898e1e02e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,17 @@ in the release notes and/or placed into UPDATING.
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
diff --git a/MOVED b/MOVED
index a95f44439a9b..89a1703bba1f 100644
--- a/MOVED
+++ b/MOVED
@@ -7463,3 +7463,4 @@ sysutils/puppet27||2015-04-07|Has expired: Does not work with Ruby 2.x
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
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk
new file mode 100644
index 000000000000..3029171fabfc
--- /dev/null
+++ b/Mk/Uses/gnustep.mk
@@ -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
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
deleted file mode 100644
index f169184be706..000000000000
--- a/Mk/bsd.gnustep.mk
+++ /dev/null
@@ -1,448 +0,0 @@
-#
-# $FreeBSD$
-#
-# This file contains some variable definitions that are supposed to
-# make your life easier when dealing with ports related to the GNUstep.
-#
-#
-# Options for a port before include this file:
-# ============================================
-#
-# USE_GNUSTEP_BASE=yes
-# your port depends on the gnustep-base port.
-#
-# USE_GNUSTEP_GUI=yes
-# your port depends on the gnustep-gui port.
-#
-# USE_GNUSTEP_BACK=yes
-# your port depends on the gnustep-back port.
-#
-# USE_GNUSTEP_CONFIGURE=yes
-# call configure script with GNUstep.sh sourced in the current shell
-#
-# USE_GNUSTEP_BUILD=yes
-# call build target with GNUstep.sh sourced in the current shell
-#
-# USE_GNUSTEP_INSTALL=yes
-# call install target with GNUstep.sh sourced in the current shell
-#
-# USE_GNUSTEP_MAKE_DIRS= App Tools
-# call build and install target in each of the given dirs.
-#
-# USE_GNUSTEP_MAKE=yes
-# require GNUstep.sh for build and install
-#
-# USE_GNUSTEP_SYSTEM_LIBS+= Renaissance:x11-toolkits/renaissance
-# depends on a shared lib in System directory
-#
-# USE_GNUSTEP_SYSTEM_BUNDLES+= EtoileMenus:x11-themes/etoile-etoilemenus
-# depends on Bundles installed in System directory
-#
-# USE_GNUSTEP_SYSTEM_THEMES+= Camaelon:x11-themes/etoile-camaelon
-# depends on Themes installed in System directory
-#
-# USE_GNUSTEP_LOCAL_LIBS+= pantomime:mail/pantomime
-# depends on a shared lib in Local directory
-#
-# USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:audio/cddb-bundle
-# depends on Bundles installed in Local directory
-#
-# USE_GNUSTEP_LOCAL_THEMES+= WildMenus:x11-themes/etoile-wildmenus
-# depends on Themes installed in Local directory
-#
-# USE_GNUSTEP_LOCAL_MENULETS+= PowerMenulet:sysutils/etoile-powermenulet
-# depends on Menulets installed in Local directory
-#
-# USE_GNUSTEP_LOCAL_ASTS+= CommentToLog:lang/etoile-lkplugins
-# depends on Ast Bundles installed in Local directory
-#
-# USE_GNUSTEP_LOCAL_BURNS+= MP3ToWav:audio/mp3towav-bundle
-# depends on Burn Bundles installed in Local directory
-#
-# USE_GNUSTEP_SYSTEM_APPS+= ProjectCenter:devel/projectcenter.app
-# depends on Application installed in System directory
-#
-# USE_GNUSTEP_LOCAL_APPS+= Ink:misc/gnustep-examples
-# depends on Application installed in Local directory
-#
-# USE_GNUSTEP_SYSTEM_TOOLS+= resizer:deskutils/gworkspace
-# depends on Tool installed in System directory
-#
-# USE_GNUSTEP_LOCAL_TOOLS+= zillion:net/zillion
-# depends on Tool installed in Local directory
-#
-# USE_GNUSTEP_SYSTEM_SERVICES+= thumbnailer:deskutils/gworkspace
-# depends on Services installed in System directory
-#
-# USE_GNUSTEP_LOCAL_SERVICES+= LaTeX:textproc/latex-service
-# depends on Services installed in Local directory
-#
-# ---------------------------------------------------------------------------
-.if !defined(_POSTMKINCLUDED)
-
-GNUstep_Include_MAINTAINER= ports@FreeBSD.org
-
-.if defined(USE_GNUSTEP_BUILD) || defined(USE_GNUSTEP_MAKE)
-BUILD_DEPENDS+= ${GNUSTEP_MAKEFILES}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
-.endif
-.if defined(USE_GNUSTEP_INSTALL) || defined(USE_GNUSTEP_MAKE)
-RUN_DEPENDS+= ${GNUSTEP_MAKEFILES}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
-.endif
-
-GNUSTEP_MAKE_PORT?= devel/gnustep-make
-GNUSTEP_BASE_PORT?= lang/gnustep-base
-GNUSTEP_GUI_PORT?= x11-toolkits/gnustep-gui
-GNUSTEP_BACK_PORT?= x11-toolkits/gnustep-back
-# Note: back-cairo will be deprecated in favour of Opal soon...
-
-.if ${MACHINE_ARCH} == "i386"
-GNU_ARCH= ix86
-.else
-GNU_ARCH= ${MACHINE_ARCH}
-.endif
-
-.if !defined(USE_MAKEFILE)
-USES+= gmake
-MAKEFILE= GNUmakefile
-.endif
-
-.if defined(ADDITIONAL_FLAGS)
-MAKE_ENV+= ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS}"
-.endif
-.if defined(ADDITIONAL_CFLAGS)
-MAKE_ENV+= ADDITIONAL_CFLAGS="${ADDITIONAL_CFLAGS}"
-.endif
-.if defined(ADDITIONAL_CPPFLAGS)
-MAKE_ENV+= ADDITIONAL_CPPFLAGS="${ADDITIONAL_CPPFLAGS}"
-.endif
-.if defined(ADDITIONAL_OBJCFLAGS)
-MAKE_ENV+= ADDITIONAL_OBJCFLAGS="${ADDITIONAL_OBJCFLAGS}"
-.endif
-.if defined(ADDITIONAL_INCLUDE_DIRS)
-MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}"
-.endif
-.if defined(ADDITIONAL_LDFLAGS)
-MAKE_ENV+= ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
-.endif
-.if defined(ADDITIONAL_LIB_DIRS)
-MAKE_ENV+= ADDITIONAL_LIB_DIRS="${ADDITIONAL_LIB_DIRS}"
-.endif
-
-GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep
-DEFAULT_LIBVERSION?= 0.0.1
-
-.if defined(USE_GNUSTEP_PREFIX)
-PREFIX= ${GNUSTEP_PREFIX}
-NO_MTREE= yes
-.endif
-
-GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_PREFIX}/System
-GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles
-GNUSTEP_SYSTEM_BUNDLES= ${GNUSTEP_SYSTEM_ROOT}/Library/Bundles
-GNUSTEP_SYSTEM_LIBRARIES= ${GNUSTEP_SYSTEM_ROOT}/Library/Libraries
-GNUSTEP_SYSTEM_APPS= ${GNUSTEP_SYSTEM_ROOT}/Applications
-GNUSTEP_SYSTEM_TOOLS= ${GNUSTEP_SYSTEM_ROOT}/Tools
-GNUSTEP_SYSTEM_SERVICES= ${GNUSTEP_SYSTEM_ROOT}/Library/Services
-
-GNUSTEP_LOCAL_ROOT= ${GNUSTEP_PREFIX}/Local
-GNUSTEP_LOCAL_BUNDLES= ${GNUSTEP_LOCAL_ROOT}/Library/Bundles
-GNUSTEP_LOCAL_LIBRARIES= ${GNUSTEP_LOCAL_ROOT}/Library/Libraries
-GNUSTEP_LOCAL_APPS= ${GNUSTEP_LOCAL_ROOT}/Applications
-GNUSTEP_LOCAL_TOOLS= ${GNUSTEP_LOCAL_ROOT}/Tools
-GNUSTEP_LOCAL_SERVICES= ${GNUSTEP_LOCAL_ROOT}/Library/Services
-
-.if defined(WITH_GNUSTEP_DEVEL)
-PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2}
-PLIST_SUB+= GNUSTEP_DEVEL=""
-PLIST_SUB+= GNUSTEP_STABLE="@comment "
-.else
-PLIST_SUB+= GNUSTEP_DEVEL="@comment "
-PLIST_SUB+= GNUSTEP_STABLE=""
-.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 exists(${DESTDIR}/usr/bin/clang)
-_CLANG!= ${DESTDIR}/usr/bin/clang --version | head -1 | \
- ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
-.else
-_CLANG= 0
-.endif
-
-.if ${_CLANG} < 34
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
-CPP= ${LOCALBASE}/bin/clang-cpp34
-CC= ${LOCALBASE}/bin/clang34
-CXX= ${LOCALBASE}/bin/clang++34
-.else
-CPP= /usr/bin/clang-cpp
-CC= /usr/bin/clang
-CXX= /usr/bin/clang++
-.endif
-
-MAKE_ENV+= "CC=${CC} CXX=${CXX}"
-
-
-
-# ---------------------------------------------------------------------------
-# using base
-#
-.if defined(USE_GNUSTEP_BASE)
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
-LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT}
-.endif
-
-# ---------------------------------------------------------------------------
-# using gui
-#
-.if defined(USE_GNUSTEP_GUI)
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT}
-.endif
-
-# ---------------------------------------------------------------------------
-# using any backend
-#
-.if defined(USE_GNUSTEP_BACK)
-BACKSUFFIX?= -024
-BACKCAIRO= libgnustep-back${BACKSUFFIX}
-
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_BACK_PORT}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_BACK_PORT}
-
-MAKE_FLAGS+= GUI_BACKEND_LIB=cairo
-.endif
-
-# ---------------------------------------------------------------------------
-# source system libs
-#
-.if defined(USE_GNUSTEP_SYSTEM_LIBS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS}
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source system bundles
-#
-.if defined(USE_GNUSTEP_SYSTEM_BUNDLES)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_BUNDLES}
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source system themes
-#
-.if defined(USE_GNUSTEP_SYSTEM_THEMES)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_THEMES}
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local libs
-#
-.if defined(USE_GNUSTEP_LOCAL_LIBS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local bundles
-#
-.if defined(USE_GNUSTEP_LOCAL_BUNDLES)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BUNDLES}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//:C;.*/;;}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//:C;.*/;;}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local themes
-#
-.if defined(USE_GNUSTEP_LOCAL_THEMES)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_THEMES}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local menulets
-#
-.if defined(USE_GNUSTEP_LOCAL_MENULETS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_MENULETS}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.menulet/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.menulet/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local asts
-#
-.if defined(USE_GNUSTEP_LOCAL_ASTS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_ASTS}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/LanguageKit/${_GNUSTEP_DEP:C/:.*//}.ast/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/LanguageKit/${_GNUSTEP_DEP:C/:.*//}.ast/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local burns
-#
-.if defined(USE_GNUSTEP_LOCAL_BURNS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BURNS}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_ROOT}/Library/Burn/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_ROOT}/Library/Burn/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source system apps
-#
-.if defined(USE_GNUSTEP_SYSTEM_APPS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_APPS}
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local apps
-#
-.if defined(USE_GNUSTEP_LOCAL_APPS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_APPS}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source system tools
-#
-.if defined(USE_GNUSTEP_SYSTEM_TOOLS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_TOOLS}
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local tools
-#
-.if defined(USE_GNUSTEP_LOCAL_TOOLS)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_TOOLS}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source system services
-#
-.if defined(USE_GNUSTEP_SYSTEM_SERVICES)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_SERVICES}
-BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_SYSTEM_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source local services
-#
-.if defined(USE_GNUSTEP_LOCAL_SERVICES)
-.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_SERVICES}
-BUILD_DEPENDS+= ${GNUSTEP_LOCAL_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-RUN_DEPENDS+= ${GNUSTEP_LOCAL_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
-.endfor
-.endif
-
-# ---------------------------------------------------------------------------
-# source GNUstep.sh
-#
-.if defined(USE_GNUSTEP_CONFIGURE)
-NO_CCACHE= Overrides PATH set from GNUstep.sh
-run-autotools::
- @${DO_NADA}
-
-do-configure:
- @(cd ${CONFIGURE_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
- if ! ${SETENV} CC="${CC}" CXX="${CXX}" CPP="${CPP}" \
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
- INSTALL_DATA="${INSTALL} -c" \
- INSTALL_PROGRAM="${INSTALL} -c" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
- ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
- ${CAT} ${CONFIGURE_LOG}; \
- ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
- ${FALSE}; \
- fi)
-.endif
-
-# ---------------------------------------------------------------------------
-# source GNUstep.sh
-#
-.if defined(USE_GNUSTEP_BUILD)
-NO_CCACHE= Overrides PATH set from GNUstep.sh
-do-build:
-.if defined(USE_GNUSTEP_MAKE_DIRS)
-.for i in ${USE_GNUSTEP_MAKE_DIRS}
- @(cd ${BUILD_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
-.endfor
-.else
- @(cd ${BUILD_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
-.endif
-
-.endif
-
-# ---------------------------------------------------------------------------
-# source GNUstep.sh
-#
-.if defined(USE_GNUSTEP_INSTALL)
-do-install:
-.if defined(USE_GNUSTEP_MAKE_DIRS)
-.for i in ${USE_GNUSTEP_MAKE_DIRS}
- @(cd ${INSTALL_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endfor
-.else
- @(cd ${INSTALL_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endif
-.if defined(PACKAGE_BUILDING) || defined(BATCH) || defined(CLEAN_ROOT)
- rm -rf /root/GNUstep
-.endif
-
-.endif
-
-.if !defined(GNUSTEP_WITH_BASE_GCC)
-TARGLIB!= ${MAKE} -C ${PORTSDIR}/${GNUSTEP_GCC_PORT} -V TARGLIB
-.endif
-
-.endif
-
-# ---------------------------------------------------------------------------
-# run ldconfig for installed shlibs
-#
-.if defined(USE_GNUSTEP_LDCONFIG)
-.for i in ${USE_GNUSTEP_LDCONFIG}
-USE_LDCONFIG+= ${i}
-.endfor
-.endif
-
-# eof
diff --git a/archivers/freetar/Makefile b/archivers/freetar/Makefile
index f3df11660fe3..2b281061d098 100644
--- a/archivers/freetar/Makefile
+++ b/archivers/freetar/Makefile
@@ -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
diff --git a/archivers/zipper/Makefile b/archivers/zipper/Makefile
index c0492b98b894..6cc8b868fbfd 100644
--- a/archivers/zipper/Makefile
+++ b/archivers/zipper/Makefile
@@ -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 "{}" ";"
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 2722d217a971..f3eecc9ad28a 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -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
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 713550bf543a..c7dc597905f3 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -13,22 +13,18 @@ COMMENT= GNUstep CD player with CDDB support
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 \
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index 1fad121e4d4d..bf191e25203c 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -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 \
diff --git a/biology/biococoa/Makefile b/biology/biococoa/Makefile
index 56d59186ea8f..987c836e062c 100644
--- a/biology/biococoa/Makefile
+++ b/biology/biococoa/Makefile
@@ -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}
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index 7923cd9cdb16..58989777eb68 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -14,22 +14,19 @@ COMMENT= Interface to Berkeley DB for GNUstep
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:
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 9a3fe1b181de..6b7db35b2795 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -13,24 +13,20 @@ COMMENT= Lightweight database abstraction layer
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 <bsd.port.mk>
diff --git a/deskutils/affiche/Makefile b/deskutils/affiche/Makefile
index 0bb34847a6aa..e5abe752d02a 100644
--- a/deskutils/affiche/Makefile
+++ b/deskutils/affiche/Makefile
@@ -12,10 +12,8 @@ COMMENT= Affiche allows people to stick notes
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
diff --git a/deskutils/appwrapper/Makefile b/deskutils/appwrapper/Makefile
index b999ce5fc31c..43df7f14e63c 100644
--- a/deskutils/appwrapper/Makefile
+++ b/deskutils/appwrapper/Makefile
@@ -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
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index 702e31cd7aa9..4b94407bc57f 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -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|' \
diff --git a/deskutils/displaycalibrator/Makefile b/deskutils/displaycalibrator/Makefile
index d01e23166b95..9664c1b8033a 100644
--- a/deskutils/displaycalibrator/Makefile
+++ b/deskutils/displaycalibrator/Makefile
@@ -9,10 +9,7 @@ MASTER_SITES= http://gnu.ethz.ch/linuks.mine.nu/displaycalibrator/
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 <bsd.port.mk>
diff --git a/deskutils/gnustep-notebook/Makefile b/deskutils/gnustep-notebook/Makefile
index dc0ae3caa222..1198c082b796 100644
--- a/deskutils/gnustep-notebook/Makefile
+++ b/deskutils/gnustep-notebook/Makefile
@@ -14,10 +14,7 @@ COMMENT= Place to store notes in an organized manner
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 <bsd.port.mk>
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 0db55afa28bb..7a087275ca91 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -15,11 +15,9 @@ COMMENT= Create GNUstep app-wrappers of non-GNUstep applications
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
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index be95e8fe0954..389d226a9483 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -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 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_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=${LOCALBASE}/lib
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
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 8052bcb37130..3692aae1f029 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -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
diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index de4b7f00a1a3..ccca9701a3e3 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -13,10 +13,8 @@ COMMENT= Online help viewer for GNUstep programs
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
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index 0fe63df30d68..a9acc5f86daf 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -12,10 +12,8 @@ COMMENT= Free clone of KlipFolio 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= Channel.m PlopFolio.m PreferencesPanelController.m
diff --git a/deskutils/preferences/Makefile b/deskutils/preferences/Makefile
index 34e481edbd53..3577fc894f02 100644
--- a/deskutils/preferences/Makefile
+++ b/deskutils/preferences/Makefile
@@ -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
diff --git a/deskutils/preferences/pkg-descr b/deskutils/preferences/pkg-descr
index 902ca42ea64a..ceed15b6a7a3 100644
--- a/deskutils/preferences/pkg-descr
+++ b/deskutils/preferences/pkg-descr
@@ -7,7 +7,4 @@ developers did not think of or even intend -- that don't require
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/
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index fa8c5c37dd01..85745667efee 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -14,11 +14,9 @@ LIB_DEPENDS+= libical.so:${PORTSDIR}/devel/libical
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
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index 34eb2c482524..d198609b092d 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -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 for GNUstep
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 <bsd.port.mk>
diff --git a/deskutils/systempreferences/pkg-descr b/deskutils/systempreferences/pkg-descr
index a113aca14909..337233c3c03b 100644
--- a/deskutils/systempreferences/pkg-descr
+++ b/deskutils/systempreferences/pkg-descr
@@ -2,6 +2,4 @@ System Preferences is a clone of the Apple OS X System Preferences
application based on a GNUstep implementation of the PreferencePanes
framework.
-LICENSE: GPL2 or later
-
WWW: http://www.gnustep.org/experience/systempreferences.html
diff --git a/deskutils/systempreferences/pkg-plist b/deskutils/systempreferences/pkg-plist
index cd6ea6083570..5f119a17e9cf 100644
--- a/deskutils/systempreferences/pkg-plist
+++ b/deskutils/systempreferences/pkg-plist
@@ -71,3 +71,19 @@ GNUstep/System/Library/Bundles/InternetModule.prefPane/Resources/InternetModule.
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%%
diff --git a/deskutils/toolboxkit/Makefile b/deskutils/toolboxkit/Makefile
index 372be06e0e8c..08871539d266 100644
--- a/deskutils/toolboxkit/Makefile
+++ b/deskutils/toolboxkit/Makefile
@@ -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 <bsd.port.mk>
diff --git a/devel/fortytwo-encore/Makefile b/devel/fortytwo-encore/Makefile
index e866dfb4addf..f4f774ee1aa5 100644
--- a/devel/fortytwo-encore/Makefile
+++ b/devel/fortytwo-encore/Makefile
@@ -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
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index ad4d67c0e2cf..61668863190b 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -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=-pthread
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/
diff --git a/devel/gnustep-make/pkg-descr b/devel/gnustep-make/pkg-descr
index 4064c5deb811..267b7c2ce47d 100644
--- a/devel/gnustep-make/pkg-descr
+++ b/devel/gnustep-make/pkg-descr
@@ -6,6 +6,4 @@ arrays, to GUI interface classes such as windows, sliders, buttons, etc.
Please contact the GNUstep maintainers at <discussion@gnustep.org> in
case of questions and help offers.
-LICENSE: GPL3
-
WWW: http://www.gnustep.org/
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 04ab602f4f5f..ebd1ddd3c1c5 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -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 <bsd.port.mk>
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 42cc16cd3c3a..5a17cd9c2e35 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -12,11 +12,9 @@ COMMENT= Graphical Object Relationship Modeller
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
diff --git a/devel/highlighterkit/Makefile b/devel/highlighterkit/Makefile
index c759aac00f1a..8c962df9e1f7 100644
--- a/devel/highlighterkit/Makefile
+++ b/devel/highlighterkit/Makefile
@@ -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 <bsd.port.mk>
diff --git a/devel/performance/Makefile b/devel/performance/Makefile
index 9e264affbfee..c9bb6373f456 100644
--- a/devel/performance/Makefile
+++ b/devel/performance/Makefile
@@ -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 GNUstep applications
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 <bsd.port.mk>
diff --git a/devel/wizardkit/Makefile b/devel/wizardkit/Makefile
index 160f1f33a916..554e38c0c518 100644
--- a/devel/wizardkit/Makefile
+++ b/devel/wizardkit/Makefile
@@ -13,12 +13,9 @@ COMMENT= Framework needed by Project Manager
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
diff --git a/finance/expense/Makefile b/finance/expense/Makefile
index 89ca0264bfac..d668be6fe3a4 100644
--- a/finance/expense/Makefile
+++ b/finance/expense/Makefile
@@ -12,10 +12,8 @@ COMMENT= Application to track your expense under 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}/Expense
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index f77162c529a4..75481e1cf703 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -14,10 +14,8 @@ COMMENT= Compact and handy FTP client 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
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/ftp/waiho/Makefile b/ftp/waiho/Makefile
index 394301ad6863..296cd5e9825f 100644
--- a/ftp/waiho/Makefile
+++ b/ftp/waiho/Makefile
@@ -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
diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index 9171fba4301c..15162ea800f8 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -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 <bsd.port.mk>
diff --git a/games/gmastermind/Makefile b/games/gmastermind/Makefile
index eaa798de9055..d4e0a24e905c 100644
--- a/games/gmastermind/Makefile
+++ b/games/gmastermind/Makefile
@@ -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
diff --git a/games/gmines/Makefile b/games/gmines/Makefile
index 27b8e874219b..0b88d1cc5b96 100644
--- a/games/gmines/Makefile
+++ b/games/gmines/Makefile
@@ -12,10 +12,8 @@ COMMENT= Well-known minesweeper game for GNUstep
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
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index fdb7e8e7fb42..43ecaf1767be 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -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
diff --git a/games/gnustep-sudoku/Makefile b/games/gnustep-sudoku/Makefile
index 7c1aca641a60..f52b0aa6b01b 100644
--- a/games/gnustep-sudoku/Makefile
+++ b/games/gnustep-sudoku/Makefile
@@ -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
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index f3b245104c4a..b2bdcecc0114 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -12,11 +12,8 @@ COMMENT= Virtual 3D Rubiks cube for GNUstep
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
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index b4fdad509cf7..27323c612c12 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -13,10 +13,8 @@ COMMENT= Shisen-sho puzzle game for GNUstep
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
diff --git a/games/jigsaw/Makefile b/games/jigsaw/Makefile
index eeb7635465f1..9cff22112c0b 100644
--- a/games/jigsaw/Makefile
+++ b/games/jigsaw/Makefile
@@ -12,10 +12,8 @@ COMMENT= Simulates a jigsaw puzzle and illustrates the use of clipping paths
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
diff --git a/games/lapispuzzle/Makefile b/games/lapispuzzle/Makefile
index a6d4223e0c33..9b038ba40f27 100644
--- a/games/lapispuzzle/Makefile
+++ b/games/lapispuzzle/Makefile
@@ -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}
diff --git a/games/nextgo/Makefile b/games/nextgo/Makefile
index df739b92b2ee..187a9cc0fd28 100644
--- a/games/nextgo/Makefile
+++ b/games/nextgo/Makefile
@@ -13,10 +13,8 @@ COMMENT= Classic Go game for OPENSTEP/GNUstep
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|' \
diff --git a/graphics/camera/Makefile b/graphics/camera/Makefile
index 612420fddc68..2e26d5523881 100644
--- a/graphics/camera/Makefile
+++ b/graphics/camera/Makefile
@@ -16,11 +16,8 @@ LICENSE_FILE= ${WRKSRC}/Documentation/COPYING
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
diff --git a/graphics/camerakit/Makefile b/graphics/camerakit/Makefile
index 505d9bbb8d99..0af0b2adaf03 100644
--- a/graphics/camerakit/Makefile
+++ b/graphics/camerakit/Makefile
@@ -12,12 +12,9 @@ COMMENT= Framework that allows to access digital cameras
LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-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= build back
+USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/CameraKit
diff --git a/graphics/cenon/Makefile b/graphics/cenon/Makefile
index b7d929215558..8f8f2dee8c30 100644
--- a/graphics/cenon/Makefile
+++ b/graphics/cenon/Makefile
@@ -14,11 +14,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= theraven@FreeBSD.org
COMMENT= Vector graphics tool for GNUstep
-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}/Cenon
MAINVERSION= 4.0.2
diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile
index d1f094138a96..65d0d24f0fad 100644
--- a/graphics/fortytwo/Makefile
+++ b/graphics/fortytwo/Makefile
@@ -13,12 +13,11 @@ COMMENT= Graph management system for GNUstep
LICENSE= LGPL21
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LOCAL_LIBS+= Encore:${ENCORE_PORT}
-USE_GNUSTEP_LOCAL_LIBS+= BDB:${FORTYTWO_BDB_PORT}
+USES= gnustep
+USE_GNUSTEP= back build
+
+LIB_DEPENDS= libEncore.so:${PORTSDIR}/devel/fortytwo-encore \
+ libBDB.so:${PORTSDIR}/databases/fortytwo-bdb
DEFAULT_LIBVERSION= 0.1
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
USE_BDB= 43+
@@ -26,8 +25,6 @@ USE_BDB= 43+
WRKSRC= ${WRKDIR}/FT-${PORTVERSION}
DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/FT
-ENCORE_PORT?= devel/fortytwo-encore
-FORTYTWO_BDB_PORT?= databases/fortytwo-bdb
ADDITIONAL_OBJCFLAGS+= -I${BDB_INCLUDE_DIR}
ADDITIONAL_LDFLAGS+= -L${BDB_LIB_DIR}
diff --git a/graphics/gnustep-slideshow/Makefile b/graphics/gnustep-slideshow/Makefile
index 786e51772e77..6fa2884b04f4 100644
--- a/graphics/gnustep-slideshow/Makefile
+++ b/graphics/gnustep-slideshow/Makefile
@@ -13,15 +13,10 @@ COMMENT= SlideShow Viewer
LICENSE= GPLv2
-USES= tar:bzip2
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LOCAL_LIBS+= SlideShow:${SLIDESHOWKIT_PORT}
+USES= tar:bzip2 gnustep
+USE_GNUSTEP= back build
+LIB_DEPENDS= libSlideShow.so:${PORTSDIR}/graphics/gnustep-slideshowkit
OBJCFLAGS+= -Dsel_eq=sel_isEqual
-SLIDESHOWKIT_PORT?= graphics/gnustep-slideshowkit
-
.include <bsd.port.mk>
diff --git a/graphics/gnustep-slideshowkit/Makefile b/graphics/gnustep-slideshowkit/Makefile
index 14a033a25cc7..b47418780210 100644
--- a/graphics/gnustep-slideshowkit/Makefile
+++ b/graphics/gnustep-slideshowkit/Makefile
@@ -11,11 +11,9 @@ DISTNAME= SlideShowKit-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SlideShow Framework
-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}
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Libraries/libSlideShow.so
diff --git a/graphics/imageviewer/Makefile b/graphics/imageviewer/Makefile
index bcb0a42cba93..d758b82a6799 100644
--- a/graphics/imageviewer/Makefile
+++ b/graphics/imageviewer/Makefile
@@ -15,10 +15,8 @@ COMMENT= GNUstep Image Viewer
LICENSE= GPLv2
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/ImageViewer.app/ImageViewer
diff --git a/graphics/laternamagica/Makefile b/graphics/laternamagica/Makefile
index 565b20a8e7c5..76aa28357559 100644
--- a/graphics/laternamagica/Makefile
+++ b/graphics/laternamagica/Makefile
@@ -12,10 +12,8 @@ COMMENT= Image viewer and slideshow application
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/LaternaMagica.app/LaternaMagica
diff --git a/graphics/pixen/Makefile b/graphics/pixen/Makefile
index ad07b748a1a6..de1e9c25847c 100644
--- a/graphics/pixen/Makefile
+++ b/graphics/pixen/Makefile
@@ -13,11 +13,8 @@ COMMENT= Graphics editing software for small-scale pictures for GNUstep
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/License.txt
-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
ADDITIONAL_OBJCFLAGS+= -Dlog2=logb
diff --git a/graphics/preview/Makefile b/graphics/preview/Makefile
index 5c6555ca35e8..279a86195342 100644
--- a/graphics/preview/Makefile
+++ b/graphics/preview/Makefile
@@ -14,10 +14,8 @@ COMMENT= Simple image viewer
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}/Preview
diff --git a/graphics/price/Makefile b/graphics/price/Makefile
index 32b1d939d3c8..eb70b19179cd 100644
--- a/graphics/price/Makefile
+++ b/graphics/price/Makefile
@@ -14,21 +14,18 @@ COMMENT= Image filtering and manipulation using GNUstep
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= desktop-file-utils
+USES= desktop-file-utils gnustep
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
+USE_GNUSTEP= back build
-DATADIR= ${GNUSTEP_LOCAL_APPS}/PRICE.app
+DATADIR= ${GNUSTEP_LOCAL_ROOT}/Applications/PRICE.app
PORTDATA= *
PLIST_FILES= ${GNUSTEP_LOCAL_TOOLS}/PRICE \
share/applications/PRICE.desktop
post-build:
${SED} -i '' -e '/^Categories/s/=/&Graphics;/' \
- ${WRKSRC}/PRICE.app/Resources/PRICE.desktop
+ ${WRKSRC}/PRICE.app/Resources/PRICE.desktop
post-install:
${STRIP_CMD} ${STAGEDIR}${DATADIR}/PRICE
diff --git a/japanese/jishyo/Makefile b/japanese/jishyo/Makefile
index d64968e3f52d..c6d025d2fe9d 100644
--- a/japanese/jishyo/Makefile
+++ b/japanese/jishyo/Makefile
@@ -13,10 +13,8 @@ COMMENT= English to Japanese dictionary 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}/${DISTNAME}
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 7194f12592d3..ccebc70f8d83 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnustep-base
PORTVERSION= 1.24.6
PORTREVISION= 6
CATEGORIES= lang devel gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= core
+MASTER_SITES= GNUSTEP/core
MAINTAINER= theraven@FreeBSD.org
COMMENT= GNUstep Foundation library
@@ -20,9 +19,7 @@ OPTIONS_DEFAULT= AVAHI
NOZEROCONF_DESC= Disable Zeroconf (Bonjour) support
AVAHI_DESC?= Zeroconf via Avahi (preferred)
-MDNS_DESC?= Zeroconf via Apple's mDNSResponder
-
-.include <bsd.port.options.mk>
+MDNS_DESC?= Zeroconf via mDNSResponder
LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi
LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2
@@ -30,33 +27,27 @@ LIB_DEPENDS+= libxslt.so:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp
LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls
LIB_DEPENDS+= libicuuc.so:${PORTSDIR}/devel/icu
-LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt
-USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-procfs --disable-openssl --enable-tls \
--with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls"\
--disable-mixedabi
CONFIGURE_ENV+= OBJCFLAGS='-fobjc-runtime=gnustep-1.7 -fblocks'
-USE_GNUSTEP= yes
-USE_GNUSTEP_CONFIGURE= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-USES= pkgconfig iconv
+USES= pkgconfig iconv gnustep
+USE_GNUSTEP= build
+USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml -DHAVE_DLADDR=1
-BREAKS_IF_PEDANTIC= yes
-PLIST_SUB+= LOCALBASE=${LOCALBASE}
ETCDIR= ${LOCALBASE}/etc
STAGEHEADER= ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Headers
PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MAVAHI}
CONFIGURE_ARGS+= --with-zeroconf-api=avahi
LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app
@@ -67,8 +58,6 @@ LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder
CONFIGURE_ARGS+= --disable-zeroconf
.endif
-PATH:= ${PREFIX}/System/Tools:${PATH}
-
post-extract:
@${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/|" \
${WRKSRC}/configure
diff --git a/lang/gnustep-base/pkg-descr b/lang/gnustep-base/pkg-descr
index d023edb1ed59..947775047dba 100644
--- a/lang/gnustep-base/pkg-descr
+++ b/lang/gnustep-base/pkg-descr
@@ -7,7 +7,4 @@ including collections, operating system interfaces, and so on.
Please contact the GNUstep maintainers at <discuss-gnustep@gnu.org> in
case of questions and offers of help.
-LICENSE: LGPL2 or later (framework)
-LICENSE: GPL3 or later (tools, docs)
-
WWW: http://www.gnustep.org/
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index 5e62081fa9c6..5c8ac55ba4ee 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -15,10 +15,8 @@ COMMENT= GNUstep-aware scheme interpreter
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-extract:
@${CHMOD} -R u+w ${WRKSRC}
diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
index 99928d17a924..e3a5d9279162 100644
--- a/mail/addresses-goodies/Makefile
+++ b/mail/addresses-goodies/Makefile
@@ -4,8 +4,7 @@ PORTNAME= addresses
PORTVERSION= 0.4.8
PORTREVISION= 3
CATEGORIES= mail gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
PKGNAMESUFFIX= -goodies${PKGNAMESUFFIX2}
DISTNAME= Addresses-${PORTVERSION}
@@ -14,20 +13,16 @@ COMMENT= Goodies for addressbook for GNUstep
LICENSE= LGPL21
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_SYSTEM_LIBS+= Inspector:${GWORKSPACE_PORT}
-USE_GNUSTEP_LOCAL_LIBS+= Addresses:${ADDRESSES_PORT}
-USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+USES= gnustep
+USE_GNUSTEP= back build
+
+LIB_DEPENDS= libInspector.so:${PORTSDIR}/deskutils/gworkspace \
+ libAddresses.so:${PORTSDIR}/mail/addresses
+USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies
-ADDRESSES_PORT?= mail/addresses
-GWORKSPACE_PORT?= deskutils/gworkspace
-
post-patch:
${REINPLACE_CMD} -e 's|LDAPAddressBook||' \
-e 's|VCFViewer||' \
diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index 3632d1057041..836a8cfc7147 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -5,8 +5,7 @@ PORTNAME= addresses
PORTVERSION= 0.4.8
PORTREVISION= 2
CATEGORIES= mail gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Addresses-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
@@ -14,10 +13,8 @@ COMMENT= Versatile addressbook for GNUstep
LICENSE= LGPL21
-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}
.include <bsd.port.mk>
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index bbe9efe60ee0..07798deab96d 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -16,13 +16,11 @@ LICENSE= GPLv2
USES+= cpe
CPE_VENDOR= gnu
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LOCAL_LIBS+= Pantomime:mail/pantomime
-USE_GNUSTEP_LOCAL_LIBS+= Addresses:mail/addresses
-USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+USES= gnustep
+USE_GNUSTEP= back build
+LIB_DEPENDS= libPantomime.so:${PORTSDIR}/mail/pantomime \
+ libAddresses.so:${PORTSDIR}/mail/addresses
+USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index b2dd41562c1b..9bd7173f6d83 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -13,11 +13,9 @@ COMMENT= Mail/MIME handling library for GNUstep
LICENSE= LGPL21
-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}
DEFAULT_LIBVERSION= 1.2
diff --git a/math/edenmath/Makefile b/math/edenmath/Makefile
index ded07389bb2c..aa6c3b844452 100644
--- a/math/edenmath/Makefile
+++ b/math/edenmath/Makefile
@@ -13,10 +13,8 @@ COMMENT= Scientific calculator 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
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index e372be6a912d..923f9f1c4281 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -14,10 +14,8 @@ LICENSE= GPLv2 # or later
LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
+USES= gnustep
+USE_GNUSTEP= back build
PORTSCOUT= skipv:0.5.2
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index 94220f803e12..0fab090400ab 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -14,10 +14,8 @@ LICENSE= GPLv2 # or later
RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop
-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|' \
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index a948695c7614..59c70ff63d01 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -12,10 +12,8 @@ COMMENT= Distributed computing project
LICENSE= BSD
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
+USES= gnustep
+USE_GNUSTEP= back build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile
index 1fb766d48c36..1a5aa39de137 100644
--- a/news/lusernet/Makefile
+++ b/news/lusernet/Makefile
@@ -13,12 +13,8 @@ COMMENT= GNUstep news reader
LICENSE= GPLv2
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LOCAL_LIBS+= Pantomime:${PANTOMIME_PORT}
-
-PANTOMIME_PORT?= mail/pantomime
+USES= gnustep
+USE_GNUSTEP= back build
+LIB_DEPENDS= libPantomime.so:${PORTSDIR}/mail/pantomime
.include <bsd.port.mk>
diff --git a/print/gspdf/Makefile b/print/gspdf/Makefile
index 13befa6f3b45..dd2df80360f0 100644
--- a/print/gspdf/Makefile
+++ b/print/gspdf/Makefile
@@ -4,17 +4,14 @@ PORTNAME= gspdf
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= print gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= GSPdf-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Postscript and Pdf Viewer for GNUstep
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
+USES= gnustep
+USE_GNUSTEP= back build
USE_GHOSTSCRIPT= yes
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index 7520a4e449d5..e2a9c3ab0acb 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -13,10 +13,8 @@ COMMENT= Qualitative Research Software for the Free World 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}/${DISTNAME}/Source
diff --git a/science/paje/Makefile b/science/paje/Makefile
index 07bb0fccf29c..44feb9fe5889 100644
--- a/science/paje/Makefile
+++ b/science/paje/Makefile
@@ -14,10 +14,8 @@ COMMENT= Generic visualization tool for GNUstep (Gantt chart and more)
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}/${DISTNAME}
MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index 7fe5ef648ba4..c722aae9a0d8 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -12,10 +12,8 @@ COMMENT= GNUstep battery monitor for laptops
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|' \
diff --git a/sysutils/timemon/Makefile b/sysutils/timemon/Makefile
index 018d491c6c35..d6edabf5578b 100644
--- a/sysutils/timemon/Makefile
+++ b/sysutils/timemon/Makefile
@@ -14,10 +14,8 @@ COMMENT= CPU time usage monitor for GNUstep
NO_CDROM= distribute without fee
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
+USES= gnustep
+USE_GNUSTEP= back build
post-patch:
${RM} ${WRKSRC}/shared_obj/*.*
diff --git a/textproc/duncan/Makefile b/textproc/duncan/Makefile
index 70e3b6b606cd..05b3ae0cc70f 100644
--- a/textproc/duncan/Makefile
+++ b/textproc/duncan/Makefile
@@ -14,10 +14,8 @@ COMMENT= English to Thai dictionary for GNUstep
LICENSE= GPLv2
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}/Duncan
diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile
index b54327dccef6..0bc1f8dd8883 100644
--- a/textproc/easydiff/Makefile
+++ b/textproc/easydiff/Makefile
@@ -12,10 +12,8 @@ COMMENT= GNUstep graphical diff
LICENSE= GPLv2 # or later; COPYING has GPLv3
-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/EasyDiff.app/EasyDiff
diff --git a/textproc/latex-service/Makefile b/textproc/latex-service/Makefile
index a690a3751628..f32af3d84291 100644
--- a/textproc/latex-service/Makefile
+++ b/textproc/latex-service/Makefile
@@ -13,11 +13,8 @@ COMMENT= LaTeX service for GNUstep
LICENSE= GPLv2
-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/Library/Services/LaTeX.service/LaTeX
diff --git a/textproc/localize/Makefile b/textproc/localize/Makefile
index f39442fbd6b4..1fea59bbe3ff 100644
--- a/textproc/localize/Makefile
+++ b/textproc/localize/Makefile
@@ -12,10 +12,8 @@ COMMENT= Application to aid in the translation of .strings files
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}/Localize
diff --git a/textproc/popup/Makefile b/textproc/popup/Makefile
index 6c8a84dfa37b..1da72a52ccf0 100644
--- a/textproc/popup/Makefile
+++ b/textproc/popup/Makefile
@@ -12,9 +12,7 @@ COMMENT= Interactive learning aid for pairs of words
LICENSE= GPLv2
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
+USES= gnustep
+USE_GNUSTEP= back build
.include <bsd.port.mk>
diff --git a/x11-clocks/aclock/Makefile b/x11-clocks/aclock/Makefile
index c8731ed2f172..1fdf0c242772 100644
--- a/x11-clocks/aclock/Makefile
+++ b/x11-clocks/aclock/Makefile
@@ -14,10 +14,8 @@ COMMENT= Analog Clock 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}/${DISTNAME}
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index c801515bd3e9..032cc1ff21da 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -4,9 +4,7 @@ PORTNAME= gnustep-back
PORTVERSION= 0.24.0
PORTREVISION= 5
CATEGORIES= x11-toolkits gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR= core
-PKGNAMESUFFIX?= ${BACK_SUFFIX}${PKGNAMESUFFIX2}
+MASTER_SITES= GNUSTEP/core
MAINTAINER= theraven@FreeBSD.org
COMMENT= GNUstep GUI backend
@@ -32,24 +30,19 @@ CONFIGURE_ARGS= --with-tiff-library=${LOCALBASE}/lib \
--enable-graphics=cairo \
--disable-glitz
-USES= pkgconfig
-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 xcursor xfixes xmu
-USE_GL= yes
+USES= gnustep pkgconfig
+USE_GNUSTEP= base gui build
+USE_XORG= xft xrender xmu xext x11 xcursor xfixes xmu
+USE_GL= yes
+USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${LOCALBASE}/include"
-MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
-BREAKS_IF_PEDANTIC= yes
+MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${LOCALBASE}/include"
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
-CFLAGS+= -I${LOCALBASE}/include/freetype2
-PLIST_SUB+= BACK=back-${BACKVERSION}
-
-PLIST_SUB+= BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
+CFLAGS+= -I${LOCALBASE}/include/freetype2
+PLIST_SUB+= BACK=back-${BACKVERSION}
+PLIST_SUB+= BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
pre-configure:
.for file in config.guess config.sub install-sh
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 19f8f73668ed..75fba785f0dd 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -38,13 +38,8 @@ CONFIGURE_ARGS+= --with-x
CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/lib
-USES= pkgconfig
-USE_GNUSTEP= yes
-USE_GNUSTEP_CONFIGURE= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_BASE= yes
-USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+USES= gnustep pkgconfig
+USE_GNUSTEP= base build
USE_XORG= x11 xt
EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch
@@ -52,17 +47,16 @@ EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.speech.patch
EXTRA_PATCHES+= ${FILESDIR}/AudioOutputSink.m.patch
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
-
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
+USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+
post-patch:
${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure
${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index edf140c89720..c5d71e22e627 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -3,110 +3,87 @@
PORTNAME= gnustep-app
PORTVERSION= 2.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnustep
-MASTER_SITES= # empty
-DISTFILES= # empty
-EXTRACT_ONLY= # empty
MAINTAINER= theraven@FreeBSD.org
COMMENT= Metaport for GNUstep applications
-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 base gui
-USE_GNUSTEP_SYSTEM_LIBS+= \
- PreferencePanes:deskutils/preferencepanes \
-
-USE_GNUSTEP_LOCAL_LIBS+= \
- Pantomime:mail/pantomime \
- Addresses:mail/addresses \
- BioCocoa:biology/biococoa \
- SlideShow:graphics/gnustep-slideshowkit \
- WizardKit:devel/wizardkit \
- HighlighterKit:devel/highlighterkit \
- GSKrab:x11/gskrab \
- Encore:devel/fortytwo-encore \
- BDB:databases/fortytwo-bdb \
- FT:graphics/fortytwo \
- CameraKit:graphics/camerakit \
- Toolbox:deskutils/toolboxkit \
-
-USE_GNUSTEP_LOCAL_BUNDLES+= \
- Cddb:audio/cddb-bundle \
-
-USE_GNUSTEP_SYSTEM_APPS+= \
- Gorm:devel/gorm \
- GShisen:games/gshisen \
- GWorkspace:deskutils/gworkspace \
- Terminal:x11/terminal.app \
- GSPdf:print/gspdf \
- SystemPreferences:deskutils/systempreferences \
- WrapperFactory:deskutils/gnustep-wrapper \
- GRubik:games/grubik \
- MDFinder:deskutils/gworkspace-gwmetadata \
-
-USE_GNUSTEP_LOCAL_APPS+= \
- GNUMail:mail/gnumail \
- EasyDiff:textproc/easydiff \
- ImageViewer:graphics/imageviewer \
- SlideShow:graphics/gnustep-slideshow \
- Preview:graphics/preview \
- TimeMon:sysutils/timemon \
- Cenon:graphics/cenon \
- PRICE:graphics/price \
- EdenMath:math/edenmath \
- Zipper:archivers/zipper \
- Camera:graphics/camera \
- Ladder:games/gnustep-ladder \
- GTAMSAnalyzer:science/gtamsanalyzer \
- Paje:science/paje \
- AClock:x11-clocks/aclock \
- LapisPuzzle:games/lapispuzzle \
- Waiho:ftp/waiho \
- Affiche:deskutils/affiche \
- GMastermind:games/gmastermind \
- Jigsaw:games/jigsaw \
- NoteBook:deskutils/gnustep-notebook \
- HelpViewer:deskutils/helpviewer \
- Duncan:textproc/duncan \
- Jishyo:japanese/jishyo \
- GMines:games/gmines \
- InnerSpace:x11/innerspace \
- FTP:ftp/gnustep-ftp \
- batmon:sysutils/batmon \
- RemoteDesk:net/remotedesk \
- DisplayCalibrator:deskutils/displaycalibrator \
- Poe:multimedia/poe \
- MPDCon:audio/mpdcon \
- PlopFolio:deskutils/plopfolio \
- CDPlayer:audio/gnustep-cdplayer \
- GScheme:lang/gscheme \
- NeXTGo:games/nextgo \
- Expense:finance/expense \
- FreeTar:archivers/freetar \
- Localize:textproc/localize \
- AppWrapper:deskutils/appwrapper \
- Pixen:graphics/pixen \
- Cartotheque:deskutils/cartotheque \
- LuserNET:news/lusernet \
- Popup:textproc/popup \
- Fortunate:games/fortunate \
- Sudoku:games/gnustep-sudoku \
- LaternaMagica:graphics/laternamagica \
- SimpleAgenda:deskutils/simpleagenda \
-
-USE_GNUSTEP_LOCAL_TOOLS+= \
- zillion:net/zillion \
- adtool:mail/addresses-goodies \
-
-
-USE_GNUSTEP_LOCAL_SERVICES+= \
- LaTeX:textproc/latex-service \
+RUN_DEPENDS= aclock>0:${PORTSDIR}/x11-clocks/aclock \
+ addresses>0:${PORTSDIR}/mail/addresses \
+ addresses-goodies>0:${PORTSDIR}/mail/addresses-goodies \
+ affiche>0:${PORTSDIR}/deskutils/affiche \
+ appwrapper>0:${PORTSDIR}/deskutils/appwrapper \
+ batmon>0:${PORTSDIR}/sysutils/batmon \
+ biococoa>0:${PORTSDIR}/biology/biococoa \
+ camera>0:${PORTSDIR}/graphics/camera \
+ camerakit>0:${PORTSDIR}/graphics/camerakit \
+ cartotheque>0:${PORTSDIR}/deskutils/cartotheque \
+ cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle \
+ gnustep-cdplayer>0:${PORTSDIR}/audio/gnustep-cdplayer \
+ cenon>0:${PORTSDIR}/graphics/cenon \
+ displaycalibrator>0:${PORTSDIR}/deskutils/displaycalibrator \
+ duncan>0:${PORTSDIR}/textproc/duncan \
+ easydiff>0:${PORTSDIR}/textproc/easydiff \
+ edenmath>0:${PORTSDIR}/math/edenmath \
+ expense>0:${PORTSDIR}/finance/expense \
+ fortunate>0:${PORTSDIR}/games/fortunate \
+ fortytwo-bdb>0:${PORTSDIR}/databases/fortytwo-bdb \
+ fortytwo-encore>0:${PORTSDIR}/devel/fortytwo-encore \
+ fortytwo>0:${PORTSDIR}/graphics/fortytwo \
+ freetar>0:${PORTSDIR}/archivers/freetar \
+ gmastermind>0:${PORTSDIR}/games/gmastermind \
+ gmines>0:${PORTSDIR}/games/gmines \
+ gnumail>0:${PORTSDIR}/mail/gnumail \
+ gnustep-ftp>0:${PORTSDIR}/ftp/gnustep-ftp \
+ gnustep-ladder>0:${PORTSDIR}/games/gnustep-ladder \
+ gnustep-slideshowkit>0:${PORTSDIR}/graphics/gnustep-slideshowkit \
+ gnustep-slideshow>0:${PORTSDIR}/graphics/gnustep-slideshow \
+ gnustep-sudoku>0:${PORTSDIR}/games/gnustep-sudoku \
+ gnustep-wrapper>0:${PORTSDIR}/deskutils/gnustep-wrapper \
+ gorm>0:${PORTSDIR}/devel/gorm \
+ grubik>0:${PORTSDIR}/games/grubik \
+ gscheme>0:${PORTSDIR}/lang/gscheme \
+ gshisen>0:${PORTSDIR}/games/gshisen \
+ gskrab>0:${PORTSDIR}/x11/gskrab \
+ gspdf>0:${PORTSDIR}/print/gspdf \
+ gtamsanalyzer>0:${PORTSDIR}/science/gtamsanalyzer \
+ gworkspace-gwmetadata>0:${PORTSDIR}/deskutils/gworkspace-gwmetadata \
+ gworkspace>0:${PORTSDIR}/deskutils/gworkspace \
+ helpviewer>0:${PORTSDIR}/deskutils/helpviewer \
+ highlighterkit>0:${PORTSDIR}/devel/highlighterkit \
+ imageviewer>0:${PORTSDIR}/graphics/imageviewer \
+ innerspace>0:${PORTSDIR}/x11/innerspace \
+ jigsaw>0:${PORTSDIR}/games/jigsaw \
+ ja-jishyo>0:${PORTSDIR}/japanese/jishyo \
+ lapispuzzle>0:${PORTSDIR}/games/lapispuzzle \
+ laternamagica>0:${PORTSDIR}/graphics/laternamagica \
+ latex-service>0:${PORTSDIR}/textproc/latex-service \
+ localize>0:${PORTSDIR}/textproc/localize \
+ lusernet>0:${PORTSDIR}/news/lusernet \
+ mpdcon>0:${PORTSDIR}/audio/mpdcon \
+ nextgo>0:${PORTSDIR}/games/nextgo \
+ gnustep-notebook>0:${PORTSDIR}/deskutils/gnustep-notebook \
+ paje>0:${PORTSDIR}/science/paje \
+ pantomime>0:${PORTSDIR}/mail/pantomime \
+ pixen>0:${PORTSDIR}/graphics/pixen \
+ plopfolio>0:${PORTSDIR}/deskutils/plopfolio \
+ poe>0:${PORTSDIR}/multimedia/poe \
+ popup>0:${PORTSDIR}/textproc/popup \
+ gnustep-preview>0:${PORTSDIR}/graphics/preview \
+ price>0:${PORTSDIR}/graphics/price \
+ remotedesk>0:${PORTSDIR}/net/remotedesk \
+ simpleagenda>0:${PORTSDIR}/deskutils/simpleagenda \
+ systempreferences>0:${PORTSDIR}/deskutils/systempreferences \
+ terminal.app>0:${PORTSDIR}/x11/terminal.app \
+ timemon>0:${PORTSDIR}/sysutils/timemon \
+ toolboxkit>0:${PORTSDIR}/deskutils/toolboxkit \
+ waiho>0:${PORTSDIR}/ftp/waiho \
+ wizardkit>0:${PORTSDIR}/devel/wizardkit \
+ zillion>0:${PORTSDIR}/net/zillion \
+ zipper>0:${PORTSDIR}/archivers/zipper
.include <bsd.port.mk>
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index 181487c87d69..a18e57cecb9c 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -13,11 +13,9 @@ COMMENT= GNUstep Keyboard Grabber
LICENSE= GPLv2 # or later
LICENSE_FILE= ${WRKSRC}/COPYING
-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}
ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/GSKrabFramework/GSKrab.framework/Versions/Current
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index ac00cb25c27e..6032545e34a9 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -12,10 +12,8 @@ COMMENT= GNUstep screensaver
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|' \
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index f2c8186615be..48aab2b569e6 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -14,10 +14,8 @@ COMMENT= Terminal Emulator for GNUstep
LICENSE= GPLv2 # only
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
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM