- use new macros

28 files changed, 30 insertions, 30 deletions

diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index 45f7f8d..fb5a76e 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	Encore:${ENCORE_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_BDB=	43
 
 WRKSRC=		${WRKDIR}/BDB-${PORTVERSION}
diff --git a/deskutils/etoile-extendedworkspacekit/Makefile b/deskutils/etoile-extendedworkspacekit/Makefile
index 5be78a3..d658a0c 100644
--- a/deskutils/etoile-extendedworkspacekit/Makefile
+++ b/deskutils/etoile-extendedworkspacekit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_SYSTEM_LIBS+=	TrackerKit:${TRACKERKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-panekit/Makefile b/deskutils/etoile-panekit/Makefile
index 0080cb9..6785aff 100644
--- a/deskutils/etoile-panekit/Makefile
+++ b/deskutils/etoile-panekit/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-servicesbarkit/Makefile b/deskutils/etoile-servicesbarkit/Makefile
index 2bafe2d..4849299 100644
--- a/deskutils/etoile-servicesbarkit/Makefile
+++ b/deskutils/etoile-servicesbarkit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	UnitKit:${UNITKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-systemconfig/Makefile b/deskutils/etoile-systemconfig/Makefile
index a11aa05..a705726 100644
--- a/deskutils/etoile-systemconfig/Makefile
+++ b/deskutils/etoile-systemconfig/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-trackerkit/Makefile b/deskutils/etoile-trackerkit/Makefile
index 00eba8e..e6b7222 100644
--- a/deskutils/etoile-trackerkit/Makefile
+++ b/deskutils/etoile-trackerkit/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-ui/Makefile b/deskutils/etoile-ui/Makefile
index 26b64e8..9be0cc3 100644
--- a/deskutils/etoile-ui/Makefile
+++ b/deskutils/etoile-ui/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 2744392..6863724 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|cp -u|cp -p|' \
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index d716939..74a6032 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/GWorkspace-${PORTVERSION}
 GNU_CONFIGURE=	yes
@@ -38,6 +38,6 @@ USE_GHOSTSCRIPT=	yes
 
 post-install:
 	${CP} ${WRKSRC}/Inspector/ContentViewersProtocol.h \
-		${SYSTEMDIR}/Library/Frameworks/Inspector.framework/Versions/A/Headers/ContentViewersProtocol.h
+		${GNUSTEP_SYSTEM_ROOT}/Library/Frameworks/Inspector.framework/Versions/A/Headers/ContentViewersProtocol.h
 
 .include <bsd.port.mk>
diff --git a/deskutils/toolboxkit/Makefile b/deskutils/toolboxkit/Makefile
index 270df11..8b4a9c0 100644
--- a/deskutils/toolboxkit/Makefile
+++ b/deskutils/toolboxkit/Makefile
@@ -20,7 +20,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_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Toolbox
 USE_GNUSTEP_MAKE_DIRS+=	Toolbox
diff --git a/devel/etoile-collectionkit/Makefile b/devel/etoile-collectionkit/Makefile
index a9f2184..0470646 100644
--- a/devel/etoile-collectionkit/Makefile
+++ b/devel/etoile-collectionkit/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/devel/etoile-foundation/Makefile b/devel/etoile-foundation/Makefile
index 1471fea..737d2a4 100644
--- a/devel/etoile-foundation/Makefile
+++ b/devel/etoile-foundation/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/devel/etoile-unitkit/Makefile b/devel/etoile-unitkit/Makefile
index 626fe6c..4390fbb 100644
--- a/devel/etoile-unitkit/Makefile
+++ b/devel/etoile-unitkit/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_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/devel/fortytwo-encore/Makefile b/devel/fortytwo-encore/Makefile
index d1b4064..4674cc7 100644
--- a/devel/fortytwo-encore/Makefile
+++ b/devel/fortytwo-encore/Makefile
@@ -23,7 +23,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Encore-${PORTVERSION}
 DOCSDIR=	${GNUSTEP_PREFIX}/Local/Library/Documentation/Encore
diff --git a/devel/highlighterkit/Makefile b/devel/highlighterkit/Makefile
index cdb51129..ce0fe23 100644
--- a/devel/highlighterkit/Makefile
+++ b/devel/highlighterkit/Makefile
@@ -20,6 +20,6 @@ USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 .include <bsd.port.mk>
diff --git a/devel/objectivelib/Makefile b/devel/objectivelib/Makefile
index 2861293..8afe0d9 100644
--- a/devel/objectivelib/Makefile
+++ b/devel/objectivelib/Makefile
@@ -21,7 +21,7 @@ USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=   ${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=   ${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}
 
diff --git a/graphics/camerakit/Makefile b/graphics/camerakit/Makefile
index 6070304..8a26933 100644
--- a/graphics/camerakit/Makefile
+++ b/graphics/camerakit/Makefile
@@ -22,7 +22,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_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/CameraKit
 
diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile
index 21c5020..71caca2 100644
--- a/graphics/fortytwo/Makefile
+++ b/graphics/fortytwo/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	Encore:${ENCORE_PORT}
 USE_GNUSTEP_LOCAL_LIBS+=	BDB:${FORTYTWO_BDB_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_BDB=	43
 
 WRKSRC=		${WRKDIR}/FT-${PORTVERSION}
diff --git a/multimedia/etoile-multimediakit/Makefile b/multimedia/etoile-multimediakit/Makefile
index 5ddd506..2df96ee 100644
--- a/multimedia/etoile-multimediakit/Makefile
+++ b/multimedia/etoile-multimediakit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LCOAL_APPS+=	Mplayer:${GNUSTEP_MPLAYER_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/net/tryst/Makefile b/net/tryst/Makefile
index a9e2abb..faf41a0 100644
--- a/net/tryst/Makefile
+++ b/net/tryst/Makefile
@@ -24,7 +24,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_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Tryst-108.pl4
 
diff --git a/sysutils/etoile-behavior/Makefile b/sysutils/etoile-behavior/Makefile
index bf59c46..364a2b5 100644
--- a/sysutils/etoile-behavior/Makefile
+++ b/sysutils/etoile-behavior/Makefile
@@ -27,6 +27,6 @@ USE_GNUSTEP_INSTALL=	yes
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Bundles/EtoileBehavior
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR="${SYSTEMDIR}"
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
 
 .include <bsd.port.mk>
diff --git a/textproc/etoile-lucenekit/Makefile b/textproc/etoile-lucenekit/Makefile
index 651c981b..052fa0f 100644
--- a/textproc/etoile-lucenekit/Makefile
+++ b/textproc/etoile-lucenekit/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	OgreKit:${OGREKIT_PORT}
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index ea02192..a8cb203 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -25,7 +25,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_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/www/etoile-bookmarkkit/Makefile b/www/etoile-bookmarkkit/Makefile
index f61ebf7..720292a 100644
--- a/www/etoile-bookmarkkit/Makefile
+++ b/www/etoile-bookmarkkit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	CollectionKit:${COLLECTIONKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/www/etoile-rsskit/Makefile b/www/etoile-rsskit/Makefile
index 4b0285b..9b7f86d 100644
--- a/www/etoile-rsskit/Makefile
+++ b/www/etoile-rsskit/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_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 06c681d..8974d0c 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	UnitKit:${UNITKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile
index 717e03f..4f65d1f 100644
--- a/x11-toolkits/gtoolkit/Makefile
+++ b/x11-toolkits/gtoolkit/Makefile
@@ -22,7 +22,7 @@ USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index 001524e..366f1ae 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -23,13 +23,13 @@ USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/XWindowServerKit
 ADDITIONAL_OBJCFLAGS+=	-I${X11BASE}/include
 ADDITIONAL_LDFLAGS+=	-L${X11BASE}/lib
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR="${SYSTEMDIR}"
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
 
 .include <bsd.port.mk>