aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2007-01-13 03:57:25 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2007-01-13 03:57:25 +0000
commitd7f59ea8de230bb289b02649cd575560e4c71e0d (patch)
treeeae797f7211f5c20b5be446f4fa649681b374597
parent3aa9b484131b5835a7875ba57cac901593286b35 (diff)
downloadports-d7f59ea8de230bb289b02649cd575560e4c71e0d.tar.gz
ports-d7f59ea8de230bb289b02649cd575560e4c71e0d.zip
Notes
-rw-r--r--audio/cddb-bundle/Makefile6
-rw-r--r--audio/cynthiune/Makefile9
-rw-r--r--audio/gnustep-cdplayer/Makefile8
-rw-r--r--audio/mpdcon/Makefile4
-rw-r--r--audio/volumecontrol.app/Makefile4
-rw-r--r--biology/adun/Makefile7
-rw-r--r--databases/gdl2/Makefile14
-rw-r--r--databases/mylibrary/Makefile6
-rw-r--r--databases/sqlclient/Makefile13
-rw-r--r--deskutils/affiche/Makefile6
-rw-r--r--deskutils/charmap/Makefile4
-rw-r--r--deskutils/displaycalibrator/Makefile3
-rw-r--r--deskutils/gnustep-notebook/Makefile2
-rw-r--r--deskutils/gnuwash/Makefile6
-rw-r--r--deskutils/helpviewer/Makefile2
-rw-r--r--deskutils/plopfolio/Makefile3
-rw-r--r--deskutils/preferencepanes/Makefile6
-rw-r--r--deskutils/preferences.app/Makefile5
-rw-r--r--deskutils/systempreferences/Makefile6
-rw-r--r--devel/gnustep-make/pkg-plist3
-rw-r--r--devel/gorm/Makefile6
-rw-r--r--devel/objcunit/Makefile10
-rw-r--r--devel/performance/Makefile7
-rw-r--r--devel/performance/pkg-plist2
-rw-r--r--devel/projectcenter.app/Makefile4
-rw-r--r--devel/projectmanager/Makefile3
-rw-r--r--devel/ruby-gnustep/Makefile6
-rw-r--r--devel/wizardkit/Makefile5
-rw-r--r--editors/emacs.app/Makefile15
-rw-r--r--editors/textedit.app/Makefile5
-rw-r--r--ftp/gnustep-ftp/Makefile2
-rw-r--r--ftp/waiho/Makefile2
-rw-r--r--games/gmastermind/Makefile2
-rw-r--r--games/gmines/Makefile3
-rw-r--r--games/gnustep-ladder/Makefile9
-rw-r--r--games/gomoku.app/Makefile2
-rw-r--r--games/gpuzzle/Makefile2
-rw-r--r--games/gridlock/Makefile7
-rw-r--r--games/grubik/Makefile3
-rw-r--r--games/gshisen/Makefile4
-rw-r--r--games/jigsaw/Makefile2
-rw-r--r--games/lapispuzzle/Makefile7
-rw-r--r--games/nextgo/Makefile2
-rw-r--r--games/stepbill/Makefile7
-rw-r--r--graphics/camera/Makefile7
-rw-r--r--graphics/gnustep-slideshowkit/Makefile5
-rw-r--r--graphics/imageviewer/Makefile3
-rw-r--r--graphics/photoclip/Makefile7
-rw-r--r--graphics/popplerkit/Makefile3
-rw-r--r--graphics/preview/Makefile5
-rw-r--r--graphics/price/Makefile5
-rw-r--r--irc/talksoup/Makefile12
-rw-r--r--japanese/jishyo/Makefile7
-rw-r--r--lang/gnustep-base/Makefile18
-rw-r--r--lang/gnustep-guile/Makefile12
-rw-r--r--lang/gnustep-objc/Makefile7
-rw-r--r--lang/gscheme/Makefile4
-rw-r--r--lang/steptalk/Makefile10
-rw-r--r--mail/addresses-goodies/Makefile3
-rw-r--r--mail/addresses/Makefile14
-rw-r--r--mail/gnumail/Makefile8
-rw-r--r--mail/pantomime/Makefile9
-rw-r--r--math/edenmath/Makefile5
-rw-r--r--math/matharray/Makefile4
-rw-r--r--math/stepulator/Makefile7
-rw-r--r--misc/gnustep-examples/Makefile20
-rw-r--r--multimedia/gnustep-mplayer/Makefile6
-rw-r--r--multimedia/poe/Makefile3
-rw-r--r--net-im/grouch/Makefile9
-rw-r--r--net/netclasses/Makefile11
-rw-r--r--net/remotedesk/Makefile3
-rw-r--r--net/zillion/Makefile6
-rw-r--r--print/gspdf/Makefile5
-rw-r--r--science/gtamsanalyzer/Makefile5
-rw-r--r--science/paje/Makefile7
-rw-r--r--shells/gscommander/Makefile6
-rw-r--r--sysutils/batmon/Makefile2
-rw-r--r--sysutils/etoile-system/Makefile2
-rw-r--r--sysutils/timemon/Makefile5
-rw-r--r--textproc/duncan/Makefile7
-rw-r--r--textproc/easydiff/Makefile3
-rw-r--r--www/gnustep-ticker/Makefile2
-rw-r--r--www/webserver/Makefile8
-rw-r--r--www/webserver/pkg-plist2
-rw-r--r--x11-clocks/aclock/Makefile7
-rw-r--r--x11-themes/etoile-camaelon/Makefile11
-rw-r--r--x11-themes/etoile-etoilemenus/Makefile3
-rw-r--r--x11-themes/etoile-wildmenus/Makefile1
-rw-r--r--x11-toolkits/gnustep-gui/Makefile3
-rw-r--r--x11-toolkits/renaissance/Makefile11
-rw-r--r--x11/gskrab/Makefile6
-rw-r--r--x11/innerspace/Makefile3
-rw-r--r--x11/terminal.app/Makefile3
93 files changed, 183 insertions, 366 deletions
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 62849b486a99..280ac7992d01 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -16,14 +16,12 @@ DISTNAME= cddb.bundle-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= CDDB client bundle GNUstep
-WRKSRC= ${WRKDIR}/cddb.bundle
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/cddb.bundle
.include <bsd.port.mk>
diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index 9d0a6b034d7d..be607fd50c54 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -23,15 +23,16 @@ LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag
-WRKSRC= ${WRKDIR}/cynthiune.app-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-MAKE_FLAGS= disable-windowsmedia=yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
USE_GNOME+= esound
+WRKSRC= ${WRKDIR}/cynthiune.app-${PORTVERSION}
+MAKE_FLAGS= disable-windowsmedia=yes
+#ALL_TARGET=
+
.include <bsd.port.mk>
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index f708affd5c33..7482f5357551 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -17,8 +17,6 @@ COMMENT= GNUstep CD player with CDDB support
LIB_DEPENDS+= cdaudio.1:${PORTSDIR}/audio/libcdaudio
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -26,14 +24,14 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:${CDDB_BUNDLE_PORT}
USE_GNUSTEP_SYSTEM_LIBS+= PrefsModule:${PREFERENCES_PORT}
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
CDDB_BUNDLE_PORT?= audio/cddb-bundle
PREFERENCES_PORT?= deskutils/preferences.app
pre-configure:
- ${LN} -s ${SYSTEMDIR}/Library/Frameworks/PrefsModule.framework/Versions/A/Headers ${WRKSRC}/AudioCD/AudioCDPrefs/PrefsModule
+ ${LN} -s ${GNUSTEP_SYSTEM_ROOT}/Library/Frameworks/PrefsModule.framework/Versions/A/Headers ${WRKSRC}/AudioCD/AudioCDPrefs/PrefsModule
post-install:
${MKDIR} ${GNUSTEP_PREFIX}/Local/Library/Headers/CDPlayer
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index 761b5dbc068e..df48917dadc4 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -15,15 +15,11 @@ DISTNAME= MPDCon-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A GNUstep MPD client
-#WRKSRC= ${WRKDIR}/X
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/audio/volumecontrol.app/Makefile b/audio/volumecontrol.app/Makefile
index 312cad8a74a1..0fc61832efdb 100644
--- a/audio/volumecontrol.app/Makefile
+++ b/audio/volumecontrol.app/Makefile
@@ -9,19 +9,17 @@ PORTNAME= volumecontrol
PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= http://www.linuks.mine.nu/volumecontrol/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Audio mixer for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
WRKSRC= ${WRKDIR}/${PORTNAME:C/\.app//}-${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/biology/adun/Makefile b/biology/adun/Makefile
index 25e9789f8fde..256aa48f20a9 100644
--- a/biology/adun/Makefile
+++ b/biology/adun/Makefile
@@ -16,15 +16,14 @@ COMMENT= Molecular Simulator for GNUstep
LIB_DEPENDS+= gsl.9:${PORTSDIR}/math/gsl
-WRKSRC= ${WRKDIR}/Adun/
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-NO_FILTER_SHLIBS= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/Adun
post-patch:
${REINPLACE_CMD} -e 's|include Defs/|-include Defs/|' \
diff --git a/databases/gdl2/Makefile b/databases/gdl2/Makefile
index b34750aaebcd..fb84bedf582f 100644
--- a/databases/gdl2/Makefile
+++ b/databases/gdl2/Makefile
@@ -15,9 +15,6 @@ DISTNAME= gnustep-dl2-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= GNUstep Database Library 2 (Enterprise Objects Framework)
-WRKSRC= ${WRKDIR}/${DISTNAME}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BASE= yes
@@ -25,11 +22,12 @@ USE_GNUSTEP_CONFIGURE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_SYSTEM_LIBS+= Gorm:${GORM_PORT}
-# broken
-# USE_LDCONFIG= yes
-INSTALL_SHLIBS= yes
-MAKEFILE= GNUmakefile
-GORM_PORT?= devel/gorm
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
USE_PGSQL= yes
+WRKSRC= ${WRKDIR}/${DISTNAME}
+GNU_CONFIGURE= yes
+
+GORM_PORT?= devel/gorm
+
.include <bsd.port.mk>
diff --git a/databases/mylibrary/Makefile b/databases/mylibrary/Makefile
index c9f2c95cdaf2..b48313abfb71 100644
--- a/databases/mylibrary/Makefile
+++ b/databases/mylibrary/Makefile
@@ -15,14 +15,12 @@ DISTNAME= MyLibrary-${PORTVERSION}g
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Wiki-style data management application for GNUstep
-WRKSRC= ${WRKDIR}/ML
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/ML
.include <bsd.port.mk>
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index d760eec57d87..acdec10e3d12 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -15,20 +15,15 @@ DISTNAME= SQLClient-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Lightweight database abstraction layer
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BASE= yes
USE_GNUSTEP_CONFIGURE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-ALL_TARGET=
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
-
USE_GNUSTEP_LOCAL_LIBS+= Performance:${PERFORMANCE_PORT}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
PERFORMANCE_PORT?= devel/performance
USE_PGSQL=yes
@@ -38,8 +33,4 @@ USE_SQLITE=yes
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-#CONFIGURE_ARGS+= --with-additional-lib="${PHREAD_LIBS}"
-#ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib
-#MAKE_ENV+= ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
-
.include <bsd.port.mk>
diff --git a/deskutils/affiche/Makefile b/deskutils/affiche/Makefile
index 6272a7b69a1f..d7e11d455bc3 100644
--- a/deskutils/affiche/Makefile
+++ b/deskutils/affiche/Makefile
@@ -14,14 +14,12 @@ DISTNAME= Affiche-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Affiche allows people to stick notes
-WRKSRC= ${WRKDIR}/Affiche
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/Affiche
.include <bsd.port.mk>
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 74144c5d4d97..3b4ed5b1b6fb 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -9,19 +9,17 @@ PORTNAME= charmap
PORTVERSION= 0.2
CATEGORIES= deskutils
MASTER_SITES= http://www.nongnu.org/charmap/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Character map for GNUstep
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
.include <bsd.port.mk>
diff --git a/deskutils/displaycalibrator/Makefile b/deskutils/displaycalibrator/Makefile
index 89f0875d1d69..5bbef6f2022d 100644
--- a/deskutils/displaycalibrator/Makefile
+++ b/deskutils/displaycalibrator/Makefile
@@ -13,13 +13,10 @@ MASTER_SITES= http://www.linuks.mine.nu/displaycalibrator/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Frontend to xgamma
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
.include <bsd.port.mk>
diff --git a/deskutils/gnustep-notebook/Makefile b/deskutils/gnustep-notebook/Makefile
index b21a980fdddd..3b5ae5d2ca69 100644
--- a/deskutils/gnustep-notebook/Makefile
+++ b/deskutils/gnustep-notebook/Makefile
@@ -15,12 +15,10 @@ DISTNAME= NoteBook-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A place to store notes in an organized manner
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
.include <bsd.port.mk>
diff --git a/deskutils/gnuwash/Makefile b/deskutils/gnuwash/Makefile
index d2a422844242..a3f8bbd9d851 100644
--- a/deskutils/gnuwash/Makefile
+++ b/deskutils/gnuwash/Makefile
@@ -15,14 +15,12 @@ DISTNAME= ${PORTNAME}.app_${PORTVERSION}.orig
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Configurable GNUstep timer application
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index 23887d845af8..ab3588762925 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -15,12 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= An online help viewer for GNUstep programs
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
.include <bsd.port.mk>
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index 7641eff27253..a6d542158d45 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -14,13 +14,10 @@ MASTER_SITE_SUBDIR= usr-apps
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Free clone of KlipFolio for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
.include <bsd.port.mk>
diff --git a/deskutils/preferencepanes/Makefile b/deskutils/preferencepanes/Makefile
index 2025576104db..c7c9342ddabc 100644
--- a/deskutils/preferencepanes/Makefile
+++ b/deskutils/preferencepanes/Makefile
@@ -14,14 +14,14 @@ DISTNAME= systempreferences-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= PreferencePanes framework for GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}/PreferencePanes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
DEFAULT_LIBVERSION= 1.0.0
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/${DISTNAME}/PreferencePanes
.include <bsd.port.mk>
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 97f85945a39f..2b07a602a471 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -17,15 +17,12 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep workspace manager
USE_BZIP2= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
MODIFY= GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \
Modules/Keyboard/GNUmakefile.preamble \
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index db56ae2a7f09..9ee331e4f78f 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -13,15 +13,15 @@ MASTER_SITES= http://www.gnustep.it/enrico/system-preferences/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= System Preferences application for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_BACK= yes
-MAKEFILE= GNUmakefile
USE_GNUSTEP_SYSTEM_LIBS+= PreferencePanes:${PREFERENCEPANES_PORT}
-PREFERENCEPANES_PORT?= deskutils/preferencepanes
+
USE_GNUSTEP_MAKE_DIRS= SystemPreferences Modules
+PREFERENCEPANES_PORT?= deskutils/preferencepanes
+
.include <bsd.port.mk>
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 7c891ea70732..db474e47809a 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -1,5 +1,3 @@
-@exec mkdir -p %D/System/Library/Makefiles
-@exec ln -s Library/Makefiles %D/System
GNUstep.conf
System/Library/Makefiles/GNUstep-reset.sh
System/Library/Makefiles/GNUstep.csh
@@ -117,6 +115,7 @@ System/Tools/debugapp
System/Tools/openapp
System/Tools/opentool
System/share/config.site
+@exec ln -s Library/Makefiles %D/System
@dirrm System/share
@dirrm System/Tools/Resources
@dirrm System/Tools/Java
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index eacc2a961e22..87cc36073b1d 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: Gorm
+# New ports collection makefile for: gorm
# Date created: 15 Mar 2002
# Whom: dirk.meyer@dinoex.sub.org
#
@@ -14,13 +14,11 @@ MASTER_SITE_SUBDIR= dev-apps
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Graphical Object Relationship Modeller
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
.include <bsd.port.mk>
diff --git a/devel/objcunit/Makefile b/devel/objcunit/Makefile
index 25ec6481dc5f..36d342ab92e8 100644
--- a/devel/objcunit/Makefile
+++ b/devel/objcunit/Makefile
@@ -15,15 +15,13 @@ DISTNAME= ObjcUnit-${PORTVERSION}-GNUstep
MAINTAINER= dinoex@FreeBSD.org
COMMENT= ObjcUnit frammework for GNUstep
-GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep
-PREFIX= ${GNUSTEP_PREFIX}
-NO_MTREE= yes
-WRKSRC= ${WRKDIR}/ObjcUnit-${PORTVERSION}/ObjcUnit
-USE_GMAKE= yes
USE_GNUSTEP= yes
+USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/ObjcUnit-${PORTVERSION}/ObjcUnit
.include <bsd.port.mk>
diff --git a/devel/performance/Makefile b/devel/performance/Makefile
index b744701f74ae..7c45c95d6bad 100644
--- a/devel/performance/Makefile
+++ b/devel/performance/Makefile
@@ -15,15 +15,12 @@ DISTNAME= Performance-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Help improve the performance of GNUstep applications
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BASE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
+DEFAULT_LIBVERSION= 0.1
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
.include <bsd.port.mk>
diff --git a/devel/performance/pkg-plist b/devel/performance/pkg-plist
index cb93b6430324..6ae8f3fa923a 100644
--- a/devel/performance/pkg-plist
+++ b/devel/performance/pkg-plist
@@ -10,7 +10,7 @@ Local/Library/Headers/Performance/GSCache.h
Local/Library/Headers/Performance/GSThroughput.h
Local/Library/Headers/Performance/GSTicker.h
Local/Library/Libraries/libPerformance.so
-Local/Library/Libraries/libPerformance.so.%%MAJORVERSION%%.1
+Local/Library/Libraries/libPerformance.so.%%LIBVERSION%%
Local/Library/Libraries/libPerformance.so.%%VERSION%%
@dirrm Local/Library/Headers/Performance
@dirrm Local/Library/Documentation/Performance
diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile
index 1c71f43e2756..13f1110da61f 100644
--- a/devel/projectcenter.app/Makefile
+++ b/devel/projectcenter.app/Makefile
@@ -15,13 +15,13 @@ DISTNAME= ProjectCenter-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A development environment for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+
PLIST_SUB+= FRAMEVERSION=${PORTVERSION}
.include <bsd.port.mk>
diff --git a/devel/projectmanager/Makefile b/devel/projectmanager/Makefile
index 87b8d21e47a5..a8d7f632a744 100644
--- a/devel/projectmanager/Makefile
+++ b/devel/projectmanager/Makefile
@@ -15,15 +15,14 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Simple, but very usable development environment
USE_BZIP2= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
USE_GNUSTEP_LOCAL_LIBS+= WizardKit:${WIZARDKIT_PORT}
USE_GNUSTEP_LOCAL_LIBS+= HighlighterKit:${HIGHLIGHTERKIT_PORT}
+
WIZARDKIT_PORT?= devel/wizardkit
HIGHLIGHTERKIT_PORT?= devel/highlighterkit
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index fef16c10f26c..36f324843919 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnustep
PORTVERSION= 0.2.2
PORTREVISION= 1
-CATEGORIES= devel ruby
+CATEGORIES= devel lang ruby
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= libs
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -18,13 +18,11 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= A Ruby interface to the GNUstep development environment
USE_RUBY= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-NO_FILTER_SHLIBS= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
post-extract:
${FIND} ${WRKSRC}/ -type f -name '.cvsignore' -delete
diff --git a/devel/wizardkit/Makefile b/devel/wizardkit/Makefile
index 9e26733f819f..25e096e12f44 100644
--- a/devel/wizardkit/Makefile
+++ b/devel/wizardkit/Makefile
@@ -15,14 +15,11 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Framework needed by Project Manager
USE_BZIP2= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
.include <bsd.port.mk>
diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile
index 6bff35281eaa..339b4ce9c78a 100644
--- a/editors/emacs.app/Makefile
+++ b/editors/emacs.app/Makefile
@@ -15,23 +15,22 @@ DISTNAME= emacs-23.0.0_NS-${PORTVERSION}pre3b
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= The GNU Emacs editor on GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
-BASEDIR=${WRKSRC}/build/Emacs.app
-BINDIR=${BASEDIR}
-CFLAGS+=-I${PREFIX}/System/Library/Headers/
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_MAKE= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+BASEDIR=${WRKSRC}/build/Emacs.app
+BINDIR=${BASEDIR}
+CFLAGS+=-I${PREFIX}/System/Library/Headers/
post-configure:
@${REINPLACE_CMD} -e 's|#define config_machfile "m/.h"|#define config_machfile "m/sparc.h"|g' ${WRKSRC}/src/config.h
- @${REINPLACE_CMD} -e's|source /etc/GNUstep/GNUstep.conf|. ${SYSMAKEDIR}/GNUstep.sh|g' ${WRKSRC}/nextstep/compile
+ @${REINPLACE_CMD} -e's|source /etc/GNUstep/GNUstep.conf|. ${GNUSTEP_MAKEFILES}/GNUstep.sh|g' ${WRKSRC}/nextstep/compile
do-build:
- (. ${SYSMAKEDIR}/GNUstep.sh; cd ${WRKSRC}/nextstep; ${MAKE_ENV} ./compile)
+ (. ${GNUSTEP_MAKEFILES}/GNUstep.sh; cd ${WRKSRC}/nextstep; ${MAKE_ENV} ./compile)
do-install:
${CP} -r ${WRKSRC}/nextstep/build/Emacs.app ${PREFIX}/System/Applications/
diff --git a/editors/textedit.app/Makefile b/editors/textedit.app/Makefile
index 5d0e401d7708..7beffe144102 100644
--- a/editors/textedit.app/Makefile
+++ b/editors/textedit.app/Makefile
@@ -14,14 +14,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Basic text editor for GNUstep
-WRKSRC= ${WRKDIR}/textedit-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/textedit-${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index c1d656f2a497..20c25dd9627a 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -15,13 +15,11 @@ DISTNAME= FTP-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Compact and handy FTP client for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/ftp/waiho/Makefile b/ftp/waiho/Makefile
index 8b5e563bdda8..8231384eb250 100644
--- a/ftp/waiho/Makefile
+++ b/ftp/waiho/Makefile
@@ -15,12 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Simple FTP client for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
.include <bsd.port.mk>
diff --git a/games/gmastermind/Makefile b/games/gmastermind/Makefile
index c7ca1355c8c9..fbf2529fe2a0 100644
--- a/games/gmastermind/Makefile
+++ b/games/gmastermind/Makefile
@@ -15,12 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= The well-known mastermind game
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
.include <bsd.port.mk>
diff --git a/games/gmines/Makefile b/games/gmines/Makefile
index 4ed7584ced52..6680360f8af1 100644
--- a/games/gmines/Makefile
+++ b/games/gmines/Makefile
@@ -15,13 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Well-known minesweeper game for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
.include <bsd.port.mk>
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index 26c392ff2fe6..2f8c6b637139 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: ladder.app
+# New ports collection makefile for: ladder
# Date created: 11 Sep 2006
# Whom: gurkan@linuks.mine.nu
#
@@ -9,7 +9,7 @@ PORTNAME= ladder
PORTVERSION= 1.0
CATEGORIES= games
MASTER_SITES= http://download.savannah.gnu.org/releases/gap/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
PKGNAMEPREFIX= gnustep-
DISTNAME= Ladder-${PORTVERSION}
@@ -18,13 +18,12 @@ COMMENT= GNU Go frontend for GNUstep
RUN_DEPENDS= gnugo:${PORTSDIR}/games/gnugo
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.mk>
diff --git a/games/gomoku.app/Makefile b/games/gomoku.app/Makefile
index c2f2fda7876c..99d272ebd7ee 100644
--- a/games/gomoku.app/Makefile
+++ b/games/gomoku.app/Makefile
@@ -14,12 +14,10 @@ DISTNAME= Gomoku-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep Gomoku game
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
.include <bsd.port.mk>
diff --git a/games/gpuzzle/Makefile b/games/gpuzzle/Makefile
index 627723545b92..180752eb6977 100644
--- a/games/gpuzzle/Makefile
+++ b/games/gpuzzle/Makefile
@@ -15,12 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Simulates a jigsaw puzzle and illustrates the use of clipping paths
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
.include <bsd.port.mk>
diff --git a/games/gridlock/Makefile b/games/gridlock/Makefile
index edf84b5e4dc9..32902e7a17ba 100644
--- a/games/gridlock/Makefile
+++ b/games/gridlock/Makefile
@@ -9,20 +9,19 @@ PORTNAME= gridlock
PORTVERSION= 1.10
CATEGORIES= games
MASTER_SITES= http://www.dozingcatsoftware.com/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= Gridlock-gnustep-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= A collection of grid-based board games for GNUstep
-WRKSRC= ${WRKDIR}/Gridlock
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/Gridlock
post-patch:
@${REINPLACE_CMD} -e 's|#import <netinet/ip_compat.h>|#import <net/if.h>\n#import <netinet/ip_compat.h>|g' ${WRKSRC}/osdep.h
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index 7c18301bcbe0..0f7b99e9b3df 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -15,14 +15,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Virtual 3D Rubiks cube for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
post-patch:
${RMDIR} ${WRKSRC}/GRubik.app/ix86/linux-gnu
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 91be99012703..fb70a77ad5e8 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -9,18 +9,16 @@ PORTNAME= gshisen
PORTVERSION= 1.2.1
CATEGORIES= games
MASTER_SITES= http://www.gnustep.it/enrico/gshisen/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Shisen-sho puzzle game for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
post-patch:
${REINPLACE_CMD} -e 's|)/Makefiles|)/Library/Makefiles|' \
diff --git a/games/jigsaw/Makefile b/games/jigsaw/Makefile
index 627723545b92..180752eb6977 100644
--- a/games/jigsaw/Makefile
+++ b/games/jigsaw/Makefile
@@ -15,12 +15,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Simulates a jigsaw puzzle and illustrates the use of clipping paths
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
.include <bsd.port.mk>
diff --git a/games/lapispuzzle/Makefile b/games/lapispuzzle/Makefile
index 30b6185c43b0..bee2057be1b1 100644
--- a/games/lapispuzzle/Makefile
+++ b/games/lapispuzzle/Makefile
@@ -9,19 +9,18 @@ PORTNAME= lapispuzzle
PORTVERSION= 1.0
CATEGORIES= games
MASTER_SITES= http://download.savannah.gnu.org/releases/gap/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= LapisPuzzle-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Tetris-like game for GNUstep
-WRKSRC= ${WRKDIR}/LapisPuzzle-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/LapisPuzzle-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/games/nextgo/Makefile b/games/nextgo/Makefile
index 5dca6c175269..ad62b8ea0897 100644
--- a/games/nextgo/Makefile
+++ b/games/nextgo/Makefile
@@ -14,13 +14,11 @@ DISTNAME= NeXTGo-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= classic Go game for OPENSTEP/GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/games/stepbill/Makefile b/games/stepbill/Makefile
index 77f74f500f03..c05b8ae44441 100644
--- a/games/stepbill/Makefile
+++ b/games/stepbill/Makefile
@@ -9,18 +9,17 @@ PORTNAME= stepbill
PORTVERSION= 2.4
CATEGORIES= games
MASTER_SITES= http://www.linuks.mine.nu/stepbill/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Get rid of those nasty Wingdows viruses
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/graphics/camera/Makefile b/graphics/camera/Makefile
index fc4948bf940c..f75ff70f0080 100644
--- a/graphics/camera/Makefile
+++ b/graphics/camera/Makefile
@@ -9,7 +9,7 @@ PORTNAME= camera
PORTVERSION= 0.8
CATEGORIES= graphics
MASTER_SITES= http://home.gna.org/gsimageapps/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= Camera-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
@@ -17,14 +17,13 @@ COMMENT= GNUstep application for digital still cameras
LIB_DEPENDS+= gphoto2_port:${PORTSDIR}/graphics/libgphoto2
-WRKSRC= ${WRKDIR}/Camera
USE_BZIP2= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/Camera
.include <bsd.port.mk>
diff --git a/graphics/gnustep-slideshowkit/Makefile b/graphics/gnustep-slideshowkit/Makefile
index 1e5e293a05f9..e720b4aa8d79 100644
--- a/graphics/gnustep-slideshowkit/Makefile
+++ b/graphics/gnustep-slideshowkit/Makefile
@@ -16,14 +16,11 @@ DISTNAME= SlideShowKit-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= SlideShow Framework
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
.include <bsd.port.mk>
diff --git a/graphics/imageviewer/Makefile b/graphics/imageviewer/Makefile
index fe6a8748e6e2..40fb8dfe3f7f 100644
--- a/graphics/imageviewer/Makefile
+++ b/graphics/imageviewer/Makefile
@@ -14,13 +14,10 @@ DISTNAME= ImageViewer-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep Image Viewer
-GUN_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
.include <bsd.port.mk>
diff --git a/graphics/photoclip/Makefile b/graphics/photoclip/Makefile
index 609f400523ad..2fc44106cd6d 100644
--- a/graphics/photoclip/Makefile
+++ b/graphics/photoclip/Makefile
@@ -9,19 +9,18 @@ PORTNAME= photoclip
PORTVERSION= 0.2.5
CATEGORIES= graphics
MASTER_SITES= http://www.vaisburd.net/PhotoClip/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= PhotoClip-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Simple image viewer and editor for GNUstep
-WRKSRC= ${WRKDIR}/PhotoClip
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/PhotoClip
.include <bsd.port.mk>
diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile
index 9c87e2e1e052..91a7696e756f 100644
--- a/graphics/popplerkit/Makefile
+++ b/graphics/popplerkit/Makefile
@@ -9,7 +9,6 @@ PORTNAME= popplerkit
PORTVERSION= 0.0.${SNAPSHOT}
CATEGORIES= graphics
MASTER_SITES= http://download.gna.org/gsimageapps/PopplerKit/
-PKGNAMEPREFIX= gnustep-
DISTNAME= PopplerKit-${SNAPSHOT}
MAINTAINER= dinoex@FreeBSD.org
@@ -21,7 +20,7 @@ USE_GNUSTEP= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LDCONFIG= ${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
USE_GNOME= gnomeprefix gnomehack gtk20
SNAPSHOT= 20050720
diff --git a/graphics/preview/Makefile b/graphics/preview/Makefile
index 7f897444bf16..7b1ec1a56e81 100644
--- a/graphics/preview/Makefile
+++ b/graphics/preview/Makefile
@@ -15,13 +15,12 @@ DISTNAME= Preview-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Simple image viewer
-WRKSRC= ${WRKDIR}/Preview
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
+
+WRKSRC= ${WRKDIR}/Preview
.include <bsd.port.mk>
diff --git a/graphics/price/Makefile b/graphics/price/Makefile
index 01876201c1af..85fe3e6b6053 100644
--- a/graphics/price/Makefile
+++ b/graphics/price/Makefile
@@ -15,13 +15,12 @@ DISTNAME= PRICE-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Image filtering and manipulation using GNUstep
-WRKSRC= ${WRKDIR}/PRICE
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/PRICE
.include <bsd.port.mk>
diff --git a/irc/talksoup/Makefile b/irc/talksoup/Makefile
index 0ce26601c506..a0e38eac5cf2 100644
--- a/irc/talksoup/Makefile
+++ b/irc/talksoup/Makefile
@@ -15,19 +15,17 @@ DISTNAME= TalkSoup-${PORTVERSION}alpha
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= IRC client for GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= netclasses:${NETCLASSES_PORT}
-# broken:
-#USE_LDCONFIG= yes
-INSTALLS_SHLIB= yes
-MAKEFILE= GNUmakefile
-NETCLASSES_PORT?= net/netclasses
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
PLIST_SUB+= APPVERSION=0.990
+NETCLASSES_PORT?= net/netclasses
+
.include <bsd.port.mk>
diff --git a/japanese/jishyo/Makefile b/japanese/jishyo/Makefile
index c7f9fbb72df7..4f2da7f3b367 100644
--- a/japanese/jishyo/Makefile
+++ b/japanese/jishyo/Makefile
@@ -9,19 +9,18 @@ PORTNAME= jishyo
PORTVERSION= 0.1
CATEGORIES= japanese
MASTER_SITES= http://www.eskimo.com/~pburns/Dictionaries/files/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= Jishyo-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= English to Japanese dictionary for GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.mk>
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 9c76c2fd960a..08a1cc19e612 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -18,24 +18,24 @@ LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
-ETCDIR= ${LOCALBASE}/etc
USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-procfs
CONFIGURE_TARGET=
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_CONFIGURE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
USE_ICONV= yes
-MAKEFILE=
+
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml
BREAKS_IF_PEDANTIC= yes
NO_FILTER_SHLIBS= yes
PLIST_SUB+= LOCALBASE=${LOCALBASE}
+ETCDIR= ${LOCALBASE}/etc
.if defined(WITHOUT_OPENSSL)
CONFIGURE_ARGS+= --disable-openssl
@@ -60,7 +60,7 @@ PATH:= ${PREFIX}/System/Tools:${PATH}
post-build:
.for i in ${MAKE_APPS}
- (cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
+ (cd ${WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
.endfor
@@ -75,16 +75,16 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/GNUstep.sh ${ETCDIR}/rc.d/GNUstep.sh
${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
.for i in ${INSTALL_APPS}
- (cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
+ (cd ${WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
${SETENV} ${MAKE_ENV} ${GMAKE} -d ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
.endfor
- ${RM} ${PREFIX}/System/Library/Libraries/libgnustep-base.so
+ ${RM} ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so
${LN} -s libgnustep-base.so.${PORTVERSION} \
- ${PREFIX}/System/Library/Libraries/libgnustep-base.so
- ${RM} ${PREFIX}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/.README.swp
+ ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so
+ ${RM} ${GNUSTEP_SYSTEM_LIBRARIES}/Resources/gnustep-base/NSTimeZones/.README.swp
test:
- @(cd ${WRKSRC}/Testing && . ${SYSTEMDIR}/Makefiles/GNUstep.sh; ${GMAKE})
+ @(cd ${WRKSRC}/Testing && . ${GNUSTEP_MAKEFILES}/GNUstep.sh; ${GMAKE})
regression-test: test
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index f9dfe3a3bbb7..b9ab393d10da 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -5,27 +5,29 @@
# $FreeBSD$
#
-PORTNAME= gnustep-guile
+PORTNAME= guile
PORTVERSION= 1.1.4
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= libs
+PKGNAMEPREFIX= gnustep-
PKGNAMESUFFIX?= ${NOX11_SUFFIX}${PKGNAMESUFFIX2}
+DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep interface to the GUILE scheme interpreter
LIB_DEPENDS+= guile.15:${PORTSDIR}/lang/guile
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET=
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_CONFIGURE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET=
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
PLIST_SUB+= GUILE_VER="${GUILE_VER}"
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index d013b99be8f1..297c1bc8f7f9 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -15,16 +15,13 @@ MASTER_SITE_SUBDIR= libs
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A snapshot of libobjc, meant to be used with GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
GNUSTEP_WITHOUT_LIBOBJC= yes
-MAKEFILE= GNUmakefile
-ALL_TARGET=
-INSTALLS_SHLIB= yes
-LDCONFIG_DIRS= ${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
NOT_FOR_ARCHS= ia64 amd64
.if !defined(GNUSTEP_WITH_BASE_GCC)
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index 4d78331b9d2b..fddbc5238222 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -15,15 +15,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep-aware scheme interpreter
-#WRKSRC= ${WRKDIR}/X
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
post-install:
${RM} -f ${GNUSTEP_PREFIX}/Local/Applications/GScheme.app/Resources/library.scm~
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 74106067d9ee..53ca8c40b43c 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -15,17 +15,13 @@ DISTNAME= StepTalk-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= The official GNUstep scripting framework
-WRKSRC= ${WRKDIR}/StepTalk
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_GUI= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-ALL_TARGET=
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-#NO_FILTER_SHLIBS= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/StepTalk
.include <bsd.port.mk>
diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
index c2f6d957ea64..fef752c2ae58 100644
--- a/mail/addresses-goodies/Makefile
+++ b/mail/addresses-goodies/Makefile
@@ -24,7 +24,7 @@ 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= ${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies
@@ -36,7 +36,6 @@ post-patch:
-e 's|VCFViewer||' \
${WRKSRC}/GNUmakefile
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
- -e 's|GNUSTEP_INSTALLATION_DIR|GNUSTEP_SYSTEM_ROOT|' \
-e 's|Library/GWorkspace|Library/Bundles|' \
-e 's|-lGWorkspace|-lInspector|' \
${WRKSRC}/VCFViewer/GNUmakefile
diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index e81bd72d61fe..01c6806f5e00 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: Addresses
+# New ports collection makefile for: addresses
# Date created: 13 Nov 2004
# Whom: Miguel Mendez <flynn@energyhq.es.eu.org>
#
@@ -15,17 +15,13 @@ DISTNAME= Addresses-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A versatile addressbook for GNUstep
-GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep
-PREFIX= ${GNUSTEP_PREFIX}
-NO_MTREE= yes
-WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}
-USE_GMAKE= yes
USE_GNUSTEP= yes
+USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index dcb0a3793b1b..f7dc3e5b565c 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -14,8 +14,6 @@ DISTNAME= GNUMail-${PORTVERSION}pre2
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep mail client
-WRKSRC= ${WRKDIR}/GNUMail
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -23,8 +21,10 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= Pantomime:${PANTOMIME_PORT}
USE_GNUSTEP_LOCAL_LIBS+= Addresses:${ADDRESSES_PORT}
-MAKEFILE=
-ALL_TARGET=
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/GNUMail
+
PANTOMIME_PORT?= mail/pantomime
ADDRESSES_PORT?= mail/addresses
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 83cba32b1aaf..9c87763a91b9 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -14,16 +14,13 @@ DISTNAME= Pantomime-${PORTVERSION}pre2
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Mail/MIME handling library for GNUstep
-WRKSRC= ${WRKDIR}/Pantomime
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-NO_FILTER_SHLIBS= yes
-INSTALLS_SHLIB= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/Pantomime
.include <bsd.port.mk>
diff --git a/math/edenmath/Makefile b/math/edenmath/Makefile
index 69f896914f2e..d1904d441322 100644
--- a/math/edenmath/Makefile
+++ b/math/edenmath/Makefile
@@ -14,13 +14,12 @@ DISTNAME= EdenMath_GNUstep-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Scientific calcualtor for GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.mk>
diff --git a/math/matharray/Makefile b/math/matharray/Makefile
index a2a375b9fa6f..8e06aac7df9b 100644
--- a/math/matharray/Makefile
+++ b/math/matharray/Makefile
@@ -15,13 +15,11 @@ DISTNAME= MathArray-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Class library for mathematical manipulation of matrices
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BASE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-NO_FILTER_SHLIBS= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
.include <bsd.port.mk>
diff --git a/math/stepulator/Makefile b/math/stepulator/Makefile
index 742f1e65d7c5..17c11d0edc3e 100644
--- a/math/stepulator/Makefile
+++ b/math/stepulator/Makefile
@@ -9,20 +9,19 @@ PORTNAME= stepulator
PORTVERSION= 1.0
CATEGORIES= math
MASTER_SITES= http://www.linuks.mine.nu/stepulator/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= ${PORTNAME}-gs-${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Scientific calculator implementing RPN notation for GNUstep
-WRKSRC= ${WRKDIR}/Stepulator-gs
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/Stepulator-gs
.include <bsd.port.mk>
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 1db42ad0df9a..cb22892e4c04 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -14,29 +14,13 @@ MASTER_SITE_SUBDIR= core
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep example applications
-WRKSRC= ${WRKDIR}/${DISTNAME}
-GUN_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-
-MAKE_APPS= Finger GFractal HostAddress
-INSTALL_APPS= Finger GFractal HostAddress
-post-build:
-.for i in ${MAKE_APPS}
- @(cd ${WRKSRC}/gui/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
-.endfor
-
-post-install:
-.for i in ${INSTALL_APPS}
- @(cd ${WRKSRC}/gui/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
-.endfor
+WRKSRC= ${WRKDIR}/${DISTNAME}
+USE_GNUSTEP_MAKE_DIRS+= . gui/Finger gui/GFractal gui/HostAddress
.include <bsd.port.mk>
diff --git a/multimedia/gnustep-mplayer/Makefile b/multimedia/gnustep-mplayer/Makefile
index c74848737cb5..2a18df524b4c 100644
--- a/multimedia/gnustep-mplayer/Makefile
+++ b/multimedia/gnustep-mplayer/Makefile
@@ -15,14 +15,12 @@ DISTNAME= Mplayer-0.4-1
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep port of MPlayerOSX
-WRKSRC= ${WRKDIR}/mplayerPort/Sources
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/mplayerPort/Sources
.include <bsd.port.mk>
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index 75f195e5372a..ce142a0387c9 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -16,13 +16,10 @@ COMMENT= A vorbis comment editor for GNUstep
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
.include <bsd.port.mk>
diff --git a/net-im/grouch/Makefile b/net-im/grouch/Makefile
index 31ac8e10f632..42cf6e783f7d 100644
--- a/net-im/grouch/Makefile
+++ b/net-im/grouch/Makefile
@@ -9,21 +9,22 @@ PORTNAME= grouch
PORTVERSION= 20060713
CATEGORIES= net-im
MASTER_SITES= http://mail.rochester.edu/~asveikau/grouch/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= AOL and ICQ Instant Messenger client for GNUstep
-WRKSRC= ${WRKDIR}/Grouch
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
USE_GNUSTEP_SYSTEM_LIBS+= Renaissance:${RENAISSANCE_PORT}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/Grouch
+
RENAISSANCE_PORT?= x11-toolkits/renaissance
.include <bsd.port.mk>
diff --git a/net/netclasses/Makefile b/net/netclasses/Makefile
index 813b5fcc470a..8ac712cbae29 100644
--- a/net/netclasses/Makefile
+++ b/net/netclasses/Makefile
@@ -14,17 +14,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Objective-C framework for socket programming with GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BASE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-# broken
-#USE_LDCONFIG= yes
-INSTALLS_SHLIB= yes
-MAKEFILE= GNUmakefile
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index 937ceea4062a..2a0a31ca46bf 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -16,14 +16,11 @@ COMMENT= Graphical interface to rdesktop
RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index 7dad948c36e9..c80a8229dc25 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -15,14 +15,12 @@ DISTNAME= ${PORTNAME}-0_1
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Distributed computing project
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
.include <bsd.port.mk>
diff --git a/print/gspdf/Makefile b/print/gspdf/Makefile
index d411b84859bf..2c81041cfaeb 100644
--- a/print/gspdf/Makefile
+++ b/print/gspdf/Makefile
@@ -13,14 +13,13 @@ MASTER_SITES= http://www.gnustep.it/enrico/gspdf/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A Postscript and Pdf Viewer for GNUstep
-WRKSRC= ${WRKDIR}/GSPdf
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
USE_GHOSTSCRIPT= yes
+WRKSRC= ${WRKDIR}/GSPdf
+
.include <bsd.port.mk>
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index dff9ab6ebdb4..4f9ca42fe0bc 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -15,13 +15,12 @@ DISTNAME= GTAMSAnalyzer.src.${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Qualitative Research Software for the Free World for GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}/Source
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}/Source
.include <bsd.port.mk>
diff --git a/science/paje/Makefile b/science/paje/Makefile
index 6d5abf6036a8..c933321dd68f 100644
--- a/science/paje/Makefile
+++ b/science/paje/Makefile
@@ -11,19 +11,18 @@ CATEGORIES= science
MASTER_SITES= http://download.fr2.forge.objectweb.org/ \
http://download.forge.objectweb.org/paje/ \
http://download.zh.forge.objectweb.org/paje/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= Paje_${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Generic visualization tool for GNUstep (Gantt chart and more)
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.mk>
diff --git a/shells/gscommander/Makefile b/shells/gscommander/Makefile
index e44f5c066d12..fc1a6e8c1ce5 100644
--- a/shells/gscommander/Makefile
+++ b/shells/gscommander/Makefile
@@ -15,14 +15,12 @@ DISTNAME= GSCommander-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep simple unix command monitor
-WRKSRC= ${WRKDIR}/GSCommander
-GUN_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/GSCommander
.include <bsd.port.mk>
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index bfc4629be561..68da2d042a50 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -13,13 +13,11 @@ MASTER_SITES= http://download.savannah.gnu.org/releases/gap/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep battery monitor for laptops
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
diff --git a/sysutils/etoile-system/Makefile b/sysutils/etoile-system/Makefile
index df9968e9a6e1..f41bad4a7184 100644
--- a/sysutils/etoile-system/Makefile
+++ b/sysutils/etoile-system/Makefile
@@ -23,7 +23,7 @@ USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LDCONFIG= ${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
diff --git a/sysutils/timemon/Makefile b/sysutils/timemon/Makefile
index 66373755af9d..b2651f81e046 100644
--- a/sysutils/timemon/Makefile
+++ b/sysutils/timemon/Makefile
@@ -16,14 +16,13 @@ EXTRACT_SUFX= .tgz
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= CPU time usage monitor for GNUstep
-WRKSRC= ${WRKDIR}/TimeMon
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/TimeMon
post-patch:
${RM} ${WRKSRC}/shared_obj/loadave.o
diff --git a/textproc/duncan/Makefile b/textproc/duncan/Makefile
index 4516e9797da7..6b391296333f 100644
--- a/textproc/duncan/Makefile
+++ b/textproc/duncan/Makefile
@@ -9,19 +9,18 @@ PORTNAME= duncan
PORTVERSION= 0.1
CATEGORIES= textproc
MASTER_SITES= http://www.eskimo.com/~pburns/Dictionaries/files/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= Duncan-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= English to Thai dictionary for GNUstep
-WRKSRC= ${WRKDIR}/Duncan
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/Duncan
.include <bsd.port.mk>
diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile
index a2f7012973f0..87ad4db3a7a9 100644
--- a/textproc/easydiff/Makefile
+++ b/textproc/easydiff/Makefile
@@ -15,13 +15,10 @@ MASTER_SITES= http://www.linuks.mine.nu/easydiff/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep graphical diff
-GUN_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
.include <bsd.port.mk>
diff --git a/www/gnustep-ticker/Makefile b/www/gnustep-ticker/Makefile
index 1a9587318265..9e588f523eb6 100644
--- a/www/gnustep-ticker/Makefile
+++ b/www/gnustep-ticker/Makefile
@@ -16,12 +16,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= RSS monitor for RSS and Atom feeds
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
.include <bsd.port.mk>
diff --git a/www/webserver/Makefile b/www/webserver/Makefile
index 16c4f25f59c3..551ba7074fd6 100644
--- a/www/webserver/Makefile
+++ b/www/webserver/Makefile
@@ -15,16 +15,12 @@ DISTNAME= WebServer-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Framework for a GNUstep to act as HTTP or HTTPS server
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BASE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-ALL_TARGET=
-LDCONFIG_DIRS= ${LOCALLIBDIR}
-INSTALLS_SHLIB= yes
-NO_FILTER_SHLIBS= yes
+DEFAULT_LIBVERSION= 1.1
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
.include <bsd.port.mk>
diff --git a/www/webserver/pkg-plist b/www/webserver/pkg-plist
index 069b6a6c2920..26be275da186 100644
--- a/www/webserver/pkg-plist
+++ b/www/webserver/pkg-plist
@@ -4,7 +4,7 @@ Local/Library/Documentation/WebServer/WebServer.igsdoc
Local/Library/Documentation/WebServer/dependencies
Local/Library/Headers/WebServer/WebServer.h
Local/Library/Libraries/libWebServer.so
-Local/Library/Libraries/libWebServer.so.%%MAJORVERSION%%.1
+Local/Library/Libraries/libWebServer.so.%%LIBVERSION%%
Local/Library/Libraries/libWebServer.so.%%VERSION%%
@dirrm Local/Library/Headers/WebServer
@dirrm Local/Library/Documentation/WebServer
diff --git a/x11-clocks/aclock/Makefile b/x11-clocks/aclock/Makefile
index b47192238a65..9696177a84d1 100644
--- a/x11-clocks/aclock/Makefile
+++ b/x11-clocks/aclock/Makefile
@@ -9,19 +9,18 @@ PORTNAME= aclock
PORTVERSION= 0.2.3
CATEGORIES= x11-clocks
MASTER_SITES= http://www.linuks.mine.nu/aclock/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= aclock-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Analog Clock for GNUstep
-WRKSRC= ${WRKDIR}/${DISTNAME}/
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.mk>
diff --git a/x11-themes/etoile-camaelon/Makefile b/x11-themes/etoile-camaelon/Makefile
index 21325cbad52a..ea53cd87d70b 100644
--- a/x11-themes/etoile-camaelon/Makefile
+++ b/x11-themes/etoile-camaelon/Makefile
@@ -8,23 +8,22 @@
PORTNAME= camaelon
PORTVERSION= 0.1.${SNAPSHOT}
CATEGORIES= x11-themes
-MASTER_SITES= http://io.debian.net/~tar/ports/distfiles/
+MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
PKGNAMEPREFIX= etoile-
DISTNAME= etoile_0+${SNAPSHOT}+dfsg.orig
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project Camaelon bundle
-SNAPSHOT= 20060917
-WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-NO_FILTER_SHLIBS= yes
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
+
+SNAPSHOT= 20060917
+WRKSRC= ${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Bundles/Camaelon
.include <bsd.port.mk>
diff --git a/x11-themes/etoile-etoilemenus/Makefile b/x11-themes/etoile-etoilemenus/Makefile
index a3bf6349d257..b7d2d46bb264 100644
--- a/x11-themes/etoile-etoilemenus/Makefile
+++ b/x11-themes/etoile-etoilemenus/Makefile
@@ -23,11 +23,10 @@ USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LDCONFIG= ${LOCALLIBDIR}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
USE_GNUSTEP_MAKE_DIRS+= Bundles/EtoileWildMenus
-MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${SYSTEMDIR}"
+MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
.include <bsd.port.mk>
diff --git a/x11-themes/etoile-wildmenus/Makefile b/x11-themes/etoile-wildmenus/Makefile
index 4b727c67611b..ac12325d0489 100644
--- a/x11-themes/etoile-wildmenus/Makefile
+++ b/x11-themes/etoile-wildmenus/Makefile
@@ -23,7 +23,6 @@ USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-USE_GNUSTEP_LDCONFIG= ${LOCALLIBDIR}
SNAPSHOT= 20061221
WRKSRC= ${WRKDIR}/Etoile/
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 5c087ac0bcb0..5317b136e9a1 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile
LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
-#NOT_FOR_ARCHS= ia64
GNU_CONFIGURE= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib
@@ -35,7 +34,7 @@ USE_GNUSTEP_CONFIGURE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_BASE= yes
-USE_GNUSTEP_LDCONFIG= ${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
USE_XLIB= yes
EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch
diff --git a/x11-toolkits/renaissance/Makefile b/x11-toolkits/renaissance/Makefile
index a3f5aa78f77c..38e974690db7 100644
--- a/x11-toolkits/renaissance/Makefile
+++ b/x11-toolkits/renaissance/Makefile
@@ -9,22 +9,19 @@ PORTNAME= renaissance
PORTVERSION= 0.8.0
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.gnustep.it/Renaissance/ \
- http://io.debian.net/~tar/ports/distfiles/
+ ${MASTER_SITE_GNUSTEP_CH}
DISTNAME= Renaissance-${PORTVERSION}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= GNUstep GUI Development Framework
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-# broken:
-#USE_LDCONFIG= yes
-INSTALL_SHLIBS= yes
-MAKEFILE= GNUmakefile
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
.include <bsd.port.mk>
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index 596b46637de4..f86c3c68fb4d 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -14,18 +14,14 @@ DISTNAME= GSKrab-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep Keyboard Grabber
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
+USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
ADDITIONAL_OBJCFLAGS+= -I${X11BASE}/include ${LOCALBASE}/include
ADDITIONAL_LDFLAGS+= -L${X11BASE}/lib
-MAKE_ENV+= ADDITIONAL_OBJCFLAGS="${ADDITIONAL_OBJCFLAGS}"
-MAKE_ENV+= ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
.include <bsd.port.mk>
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index 37a40ba2e255..ef73bb067581 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -15,13 +15,10 @@ DISTNAME= InnerSpace-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep screensaver
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE=
-ALL_TARGET=
.include <bsd.port.mk>
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index 669042a90a26..8a542467e9f3 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -15,15 +15,12 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= gurkan@linuks.mine.nu
COMMENT= Terminal Emulator for GNUstep
-USE_GMAKE= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
-MAKEFILE= GNUmakefile
-
WRKSRC= ${WRKDIR}/${PORTNAME:C/\.app//}-${DISTVERSION}${DISTVERSIONSUFFIX:C/\.orig//}
.include <bsd.port.pre.mk>