- update for gnustep-make-2.0.0

5 files changed, 26 insertions, 17 deletions

diff --git a/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index 0f7476fbb6b2..688713fd89d0 100644
--- a/x11/etoile-iterm/Makefile
+++ b/x11/etoile-iterm/Makefile
@@ -31,4 +31,10 @@ USE_GNUSTEP_MAKE_DIRS+=	Services/User/Terminal
 
 ADDRESSES_PORT?=	mail/addresses
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600000
+IGNORE=		incompatible thread functions
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/etoile-iterm/pkg-plist b/x11/etoile-iterm/pkg-plist
index 6a79768c925c..a22178be2284 100644
--- a/x11/etoile-iterm/pkg-plist
+++ b/x11/etoile-iterm/pkg-plist
@@ -9,7 +9,7 @@ Local/Applications/iTerm.app/Resources/iTerm.iconheader
 Local/Applications/iTerm.app/Resources/iTerm.plist
 Local/Applications/iTerm.app/Resources/iTerm_Framework.plist
 Local/Applications/iTerm.app/iTerm
-Local/Applications/iTerm.app/library_paths.openapp
 Local/Applications/iTerm.app/stamp.make
+Local/Tools/iTerm
 @dirrm Local/Applications/iTerm.app/Resources
 @dirrm Local/Applications/iTerm.app
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index d2f57554faac..5632ec1134b4 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -22,7 +22,8 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-ADDITIONAL_OBJCFLAGS+=	-I${X11BASE}/include ${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${X11BASE}/lib
+ADDITIONAL_INCLUDE_DIRS+=	-I${X11BASE}/include ${LOCALBASE}/include
+ADDITIONAL_LIB_DIRS+=	-L${X11BASE}/lib
+ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/GSKrabFramework/GSKrab.framework/Versions/Current
 
 .include <bsd.port.mk>
diff --git a/x11/gskrab/pkg-plist b/x11/gskrab/pkg-plist
index 3eccb29fcfab..6ea5d3cfe741 100644
--- a/x11/gskrab/pkg-plist
+++ b/x11/gskrab/pkg-plist
@@ -1,22 +1,24 @@
+Local/Library/Frameworks/GSKrab.framework/GSKrab
 Local/Library/Frameworks/GSKrab.framework/Headers
 Local/Library/Frameworks/GSKrab.framework/Resources
-Local/Library/Frameworks/GSKrab.framework/Versions/A/GSKrab
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrab.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrabClient.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrabKeyCode.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers/GSKrabServer.h
-Local/Library/Frameworks/GSKrab.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/GSKrab.framework/Versions/A/libGSKrab.so
-Local/Library/Frameworks/GSKrab.framework/Versions/A/libGSKrab.so.%%MAJORVERSION%%
-Local/Library/Frameworks/GSKrab.framework/Versions/A/libGSKrab.so.%%VERSION%%
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/GSKrab
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrab.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabClient.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabKeyCode.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers/GSKrabServer.h
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%MAJORVERSION%%
+Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/libGSKrab.so.%%VERSION%%
 Local/Library/Frameworks/GSKrab.framework/Versions/Current
+Local/Library/Frameworks/GSKrab.framework/libGSKrab.so
 Local/Library/Headers/GSKrab
 Local/Library/Libraries/libGSKrab.so
 Local/Library/Libraries/libGSKrab.so.%%MAJORVERSION%%
 Local/Library/Libraries/libGSKrab.so.%%VERSION%%
 Local/Tools/gsks
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/A
+@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/GSKrab.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/GSKrab.framework/Versions
 @dirrm Local/Library/Frameworks/GSKrab.framework
diff --git a/x11/innerspace/pkg-plist b/x11/innerspace/pkg-plist
index c1e146b315f2..478f4565a72d 100644
--- a/x11/innerspace/pkg-plist
+++ b/x11/innerspace/pkg-plist
@@ -17,8 +17,8 @@ Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickS
 Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/data.info
 Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm/objects.gorm
 Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/stamp.make
-Local/Applications/InnerSpace.app/library_paths.openapp
 Local/Applications/InnerSpace.app/stamp.make
+Local/Tools/InnerSpace
 @dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources/NickSpace.gorm
 @dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace/Resources
 @dirrm Local/Applications/InnerSpace.app/Resources/NickSpace.InnerSpace