- update to use new bsd.gnustep.mk

Approved by:	gurkan@linuks.mine.nu

9 files changed, 16 insertions, 30 deletions

diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 7c891ea..db474e4 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 eacc2a9..87cc360 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 25ec648..36d342a 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 b744701..7c45c95 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 cb93b64..6ae8f3f 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 1c71f43..13f1110 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 87b8d21..a8d7f63 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 fef16c1..36f3248 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 9e26733..25e096e 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>