Upgrade to 0.2.4.

3 files changed, 66 insertions, 31 deletions

diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile
index 39861dd37b21..3d28631d9f1a 100644
--- a/devel/projectcenter.app/Makefile
+++ b/devel/projectcenter.app/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	projectcenter.app
-PORTVERSION=	0.2.0
+PORTVERSION=	0.2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.projectcenter.ch/
 DISTNAME=	ProjectCenter-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/GNUstep/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep
-RUN_DEPENDS=	${LOCALBASE}/GNUstep/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep
+BUILD_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+RUN_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
 
 PREFIX=		${LOCALBASE}/GNUstep
 WRKSRC=		${WRKDIR}/ProjectCenter
@@ -22,10 +22,12 @@ USE_NEWGCC=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	ADDITIONAL_INCLUDE_DIRS="-I${WRKSRC}" \
-		ADDITIONAL_LIB_DIRS="-L${WRKSRC}/PCLib/shared_obj/${GNU_ARCH}/freebsdelf/gnu-gnu-gnu-xgps"
+		ADDITIONAL_LIB_DIRS="-L${WRKSRC}/PCLib/shared_obj/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu"
 ALL_TARGET=
 NO_MTREE=	yes
 
+XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} == "i386"
@@ -34,13 +36,13 @@ GNU_ARCH=	ix86
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 
-PLIST_SUB+=	GNU_ARCH=${GNU_ARCH}
+PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
 
 # XXX This is ugly beyond measure. Don't tell anyone I did this.
 post-extract:
 	${LN} -sf ${WRKSRC}/PCLib/*.h ${WRKSRC}/ProjectCenter
 
-# Quick workaround until I found out how to set the real path in the code
+# Quick workaround until I find out how to set the real path in the code
 post-patch:
 .for file in PCLib/PCBundleLoader.m ProjectCenter/PCAppController.m
 	${PERL} -pi -e "s:@\"/usr/GNUstep:@\"${PREFIX}:g" ${WRKSRC}/${file}
diff --git a/devel/projectcenter.app/distinfo b/devel/projectcenter.app/distinfo
index 80fd67fd1d2c..af733c6a2728 100644
--- a/devel/projectcenter.app/distinfo
+++ b/devel/projectcenter.app/distinfo
@@ -1 +1 @@
-MD5 (ProjectCenter-0.2.0.tar.gz) = 449a34b623119632aa19e1d6131dd319
+MD5 (ProjectCenter-0.2.4.tar.gz) = 59a6e11f530d3672e88f9f88050bb08e
diff --git a/devel/projectcenter.app/pkg-plist b/devel/projectcenter.app/pkg-plist
index 041169d444cc..ad939ba2fd6b 100644
--- a/devel/projectcenter.app/pkg-plist
+++ b/devel/projectcenter.app/pkg-plist
@@ -1,19 +1,20 @@
-Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/ProjectCenter
-Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/library_paths.openapp
+Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/ProjectCenter
+Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
 Local/Apps/ProjectCenter.app/ProjectCenter
 Local/Apps/ProjectCenter.app/Resources/FileIcon_.c.tiff
 Local/Apps/ProjectCenter.app/Resources/FileIcon_.h.tiff
 Local/Apps/ProjectCenter.app/Resources/FileIcon_.m.tiff
 Local/Apps/ProjectCenter.app/Resources/FileIcon_rtf.tiff
 Local/Apps/ProjectCenter.app/Resources/Info-gnustep.plist
-Local/Apps/ProjectCenter.app/Resources/Info-project.plist
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter.app.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter.tiff
+Local/Apps/ProjectCenter.app/Resources/ProjectCenterInfo.plist
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter_clean.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter_debug.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter_install.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter_make.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCenter_profile.tiff
+Local/Apps/ProjectCenter.app/Resources/ProjectCenter_rpm.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCentre_add.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCentre_build.tiff
 Local/Apps/ProjectCenter.app/Resources/ProjectCentre_clean.tiff
@@ -43,9 +44,12 @@ Local/Headers/ProjectCenter/ProjectDebugger.h
 Local/Headers/ProjectCenter/ProjectEditor.h
 Local/Headers/ProjectCenter/ProjectType.h
 Local/Headers/ProjectCenter/Server.h
-Local/Libraries/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/libProjectCenter.so
-Local/Libraries/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/libProjectCenter.so.0.2.0
-Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/PCAppProj
+Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libProjectCenter.so
+Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libProjectCenter.so.0
+Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libProjectCenter.so.%%VERSION%%
+Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/PCAppProj
+Local/Library/ProjectCenter/PCAppProj.bundle/Contents/Info.plist
+Local/Library/ProjectCenter/PCAppProj.bundle/Contents/Resources
 Local/Library/ProjectCenter/PCAppProj.bundle/Resources/AppController.h
 Local/Library/ProjectCenter/PCAppProj.bundle/Resources/AppController.m
 Local/Library/ProjectCenter/PCAppProj.bundle/Resources/Info-gnustep.plist
@@ -53,7 +57,9 @@ Local/Library/ProjectCenter/PCAppProj.bundle/Resources/Info-project.plist
 Local/Library/ProjectCenter/PCAppProj.bundle/Resources/Info.plist
 Local/Library/ProjectCenter/PCAppProj.bundle/Resources/PC.proj
 Local/Library/ProjectCenter/PCAppProj.bundle/Resources/main.m
-Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/PCBaseFileTypes
+Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/PCBaseFileTypes
+Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Contents/Info.plist
+Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Contents/Resources
 Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/Info-gnustep.plist
 Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/Info.plist
 Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/cfile.template
@@ -61,54 +67,81 @@ Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/cheader.template
 Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/class.template
 Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/header.template
 Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources/protocol.template
+Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/PCBundleProj
+Local/Library/ProjectCenter/PCBundleProj.bundle/Contents/Info.plist
+Local/Library/ProjectCenter/PCBundleProj.bundle/Contents/Resources
 Local/Library/ProjectCenter/PCBundleProj.bundle/Resources/Info-gnustep.plist
 Local/Library/ProjectCenter/PCBundleProj.bundle/Resources/Info.plist
 Local/Library/ProjectCenter/PCBundleProj.bundle/Resources/PC.proj
-Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/PCBundleProj
-Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/PCLibProj
+Local/Library/ProjectCenter/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%//gnu-gnu-gnu/PCGormProj
+Local/Library/ProjectCenter/PCGormProj.bundle/Contents/Info.plist
+Local/Library/ProjectCenter/PCGormProj.bundle/Contents/Resources
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/Info-gnustep.plist
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/Info-project.plist
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/Info.plist
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/PC.proj
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/baseInterface.classes
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/baseInterface.gorm
+Local/Library/ProjectCenter/PCGormProj.bundle/Resources/main.m
+Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/PCLibProj
+Local/Library/ProjectCenter/PCLibProj.bundle/Contents/Info.plist
+Local/Library/ProjectCenter/PCLibProj.bundle/Contents/Resources
 Local/Library/ProjectCenter/PCLibProj.bundle/Resources/Info-gnustep.plist
 Local/Library/ProjectCenter/PCLibProj.bundle/Resources/Info.plist
 Local/Library/ProjectCenter/PCLibProj.bundle/Resources/LibProject.gmodel
 Local/Library/ProjectCenter/PCLibProj.bundle/Resources/PC.proj
 Local/Library/ProjectCenter/PCLibProj.bundle/Resources/Version
-Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/PCToolProj
+Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/PCToolProj
+Local/Library/ProjectCenter/PCToolProj.bundle/Contents/Info.plist
+Local/Library/ProjectCenter/PCToolProj.bundle/Contents/Resources
 Local/Library/ProjectCenter/PCToolProj.bundle/Resources/Info-gnustep.plist
 Local/Library/ProjectCenter/PCToolProj.bundle/Resources/Info-project.plist
 Local/Library/ProjectCenter/PCToolProj.bundle/Resources/Info.plist
 Local/Library/ProjectCenter/PCToolProj.bundle/Resources/PC.proj
 Local/Library/ProjectCenter/PCToolProj.bundle/Resources/main.m
-@dirrm Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Library/ProjectCenter/PCToolProj.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/ProjectCenter/PCToolProj.bundle/Resources
+@dirrm Local/Library/ProjectCenter/PCToolProj.bundle/Contents
 @dirrm Local/Library/ProjectCenter/PCToolProj.bundle
-@dirrm Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Library/ProjectCenter/PCLibProj.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/ProjectCenter/PCLibProj.bundle/Resources
+@dirrm Local/Library/ProjectCenter/PCLibProj.bundle/Contents
 @dirrm Local/Library/ProjectCenter/PCLibProj.bundle
-@dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Library/ProjectCenter/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/ProjectCenter/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/ProjectCenter/PCGormProj.bundle/%%GNU_ARCH%%
+@dirrm Local/Library/ProjectCenter/PCGormProj.bundle/Resources
+@dirrm Local/Library/ProjectCenter/PCGormProj.bundle/Contents
+@dirrm Local/Library/ProjectCenter/PCGormProj.bundle
+@dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/Resources
+@dirrm Local/Library/ProjectCenter/PCBundleProj.bundle/Contents
 @dirrm Local/Library/ProjectCenter/PCBundleProj.bundle
-@dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Resources
+@dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle/Contents
 @dirrm Local/Library/ProjectCenter/PCBaseFileTypes.bundle
-@dirrm Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Library/ProjectCenter/PCAppProj.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/ProjectCenter/PCAppProj.bundle/Resources
+@dirrm Local/Library/ProjectCenter/PCAppProj.bundle/Contents
 @dirrm Local/Library/ProjectCenter/PCAppProj.bundle
 @dirrm Local/Library/ProjectCenter
-@dirrm Local/Libraries/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Libraries/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Libraries/%%GNU_ARCH%%
 @dirrm Local/Headers/ProjectCenter
-@dirrm Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/freebsdelf
+@dirrm Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Apps/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Apps/ProjectCenter.app/%%GNU_ARCH%%
 @dirrm Local/Apps/ProjectCenter.app/Resources
 @dirrm Local/Apps/ProjectCenter.app