From 13b3264699685f92129a875b8e9a748e4009018d Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Fri, 25 May 2007 05:55:36 +0000
Subject: - update for gnustep-make-2.0.0

---
 x11/gskrab/Makefile  |  5 +++--
 x11/gskrab/pkg-plist | 26 ++++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'x11/gskrab')

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
-- 
cgit v1.2.3