23 files changed, 3 insertions, 33 deletions

diff --git a/astro/position/Makefile b/astro/position/Makefile
index 335d494aacd4..dc2a8dbff4da 100644
--- a/astro/position/Makefile
+++ b/astro/position/Makefile
@@ -24,8 +24,6 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 
 WRKSRC=		${WRKDIR}/Position/Position
-ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 PROJ4_PORT?=	misc/proj4
diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index d81edaa63d20..3c02fe0a3556 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -35,7 +35,6 @@ USE_GNOME+=	esound
 WRKSRC=		${WRKDIR}/cynthiune.app-${PORTVERSION}
 ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/libmodplug
 ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/Cynthiune/Cynthiune.framework/Versions/Current
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 MAKE_FLAGS=	disable-windowsmedia=yes debug=no
 
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 0186390a1a99..b6607e136cb6 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -29,7 +29,6 @@ USE_GNUSTEP_SYSTEM_LIBS+=	PrefsModule:${PREFERENCES_PORT}
 
 WRKSRC=		${WRKDIR}/CDPlayer-${PORTVERSION}
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 
 CDDB_BUNDLE_PORT?=	audio/cddb-bundle
 PREFERENCES_PORT?=	deskutils/preferences.app
diff --git a/audio/mp3towav-bundle/Makefile b/audio/mp3towav-bundle/Makefile
index 07052c8bdbfc..e3ab916e84aa 100644
--- a/audio/mp3towav-bundle/Makefile
+++ b/audio/mp3towav-bundle/Makefile
@@ -26,7 +26,6 @@ USE_GNUSTEP_LOCAL_APPS+=	Burn:${BURN_PORT}
 WRKSRC=		${WRKDIR}/MP3ToWav
 ADDITIONAL_INCLUDE_DIRS+=	-I${GNUSTEP_PREFIX}/Local/Library/Headers/Burn
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 
 BURN_PORT?=	sysutils/burn
 
diff --git a/biology/adun/Makefile b/biology/adun/Makefile
index 6cc4792561d1..7031b9afa01f 100644
--- a/biology/adun/Makefile
+++ b/biology/adun/Makefile
@@ -42,7 +42,7 @@ PLIST_SUB+=	LIBVERSION5=${DEFAULT_LIBVERSION5}
 PLIST_SUB+=	MAJORLIBVERSION5=${DEFAULT_LIBVERSION5:C/([0-9]).*/\1/1}
 ADDITIONAL_CPPFLAGS=	-D__FREEBSD__
 ADDITIONAL_INCLUDE_DIRS=	-I${WRKSRC}/Kernel -I${WRKSRC}
-ADDITIONAL_LIB_DIRS=	-L${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework -L${LOCALBASE}/MolTalk/MolTalk.framework -L${LOCALBASE}/lib
+ADDITIONAL_LIB_DIRS=	-L${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework -L${LOCALBASE}/MolTalk/MolTalk.framework
 ADDITIONAL_LDFLAGS=	-rpath-link=${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework:${LOCALBASE}/MolTalk/MolTalk.framework
 MAKE_ENV+=	GSL_LIB_DIR=${LOCALBASE}/lib
 MAKE_ENV+=	GSL_INCLUDE_DIR=${LOCALBASE}/include
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 76a319aa45f8..31a5b2506333 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -33,7 +33,6 @@ USE_MYSQL=yes
 USE_SQLITE=yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 DEFAULT_LIBVERSION=	1.3
 
diff --git a/deskutils/etoile-corner/Makefile b/deskutils/etoile-corner/Makefile
index 4abe6879db9e..5fc84bb87ead 100644
--- a/deskutils/etoile-corner/Makefile
+++ b/deskutils/etoile-corner/Makefile
@@ -28,7 +28,6 @@ USE_XORG=	x11
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/Corner
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	System/Tools/Corner
 
 SMALLTALKKIT_PORT?=	lang/etoile-smalltalkkit
diff --git a/deskutils/etoile-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile
index 21b78c54bd43..acebcdaf28b9 100644
--- a/deskutils/etoile-menuserver/Makefile
+++ b/deskutils/etoile-menuserver/Makefile
@@ -26,8 +26,6 @@ USE_GNUSTEP_LOCAL_LIBS+=	SystemConfig:${SYSTEMCONFIG_PORT}
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/MenuServer
-ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 
 XWINDOWSERVERKIT_PORT?=		x11/etoile-xwindowserverkit
 SYSTEMCONFIG_PORT?=		deskutils/etoile-systemconfig
diff --git a/deskutils/etoile-systemconfig/Makefile b/deskutils/etoile-systemconfig/Makefile
index b3b5e7c34fa7..d919ee284881 100644
--- a/deskutils/etoile-systemconfig/Makefile
+++ b/deskutils/etoile-systemconfig/Makefile
@@ -26,6 +26,5 @@ USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 DEFAULT_LIBVERSION=	0.2
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/SystemConfig
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index 82595465d025..1f25837568b9 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -22,6 +22,4 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
-
 .include <bsd.port.mk>
diff --git a/graphics/camerakit/Makefile b/graphics/camerakit/Makefile
index 4f34f41fe193..2f3b1e515fdd 100644
--- a/graphics/camerakit/Makefile
+++ b/graphics/camerakit/Makefile
@@ -26,6 +26,5 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/CameraKit
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/lang/etoile-compiler/Makefile b/lang/etoile-compiler/Makefile
index 194401024749..aed586215ea9 100644
--- a/lang/etoile-compiler/Makefile
+++ b/lang/etoile-compiler/Makefile
@@ -29,7 +29,6 @@ USE_GNUSTEP_LOCAL_LIBS+=	SmalltalkSupport:${SMALLTALKKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Languages/Compiler
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	Local/Tools/edlc
 
 FOUNDATION_PORT?=	devel/etoile-foundation
diff --git a/lang/etoile-languagekit/Makefile b/lang/etoile-languagekit/Makefile
index c1367b4c6413..d06a88198f7e 100644
--- a/lang/etoile-languagekit/Makefile
+++ b/lang/etoile-languagekit/Makefile
@@ -32,7 +32,6 @@ DEFAULT_LIBVERSION=	0.6
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Languages/LanguageKit
 DEFAULT_LIBVERSION2=	0.0.1
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
 PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
 
diff --git a/lang/etoile-smalltalkkit/Makefile b/lang/etoile-smalltalkkit/Makefile
index fc216af48489..7e14381fbec6 100644
--- a/lang/etoile-smalltalkkit/Makefile
+++ b/lang/etoile-smalltalkkit/Makefile
@@ -31,7 +31,6 @@ DEFAULT_LIBVERSION=	0.6
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Languages/Smalltalk
 DEFAULT_LIBVERSION2=	0.0.1
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
 PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
 
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index fab921f224c8..3b32020a3573 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -25,6 +25,5 @@ USE_GL=		yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GNUSTEP_MAKE_DIRS+=	. gui/Finger gui/GFractal gui/HostAddress
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/multimedia/etoile-multimediakit/Makefile b/multimedia/etoile-multimediakit/Makefile
index b08c4c09737f..9d0337178dd8 100644
--- a/multimedia/etoile-multimediakit/Makefile
+++ b/multimedia/etoile-multimediakit/Makefile
@@ -31,8 +31,6 @@ USE_XORG=	x11
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/MultimediaKit
-ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 
 GNUSTEP_MPLAYER_PORT?=	multimedia/gnustep-mplayer
 
diff --git a/net/tryst/Makefile b/net/tryst/Makefile
index e005de415564..5f67b833d413 100644
--- a/net/tryst/Makefile
+++ b/net/tryst/Makefile
@@ -27,7 +27,6 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Tryst-108.pl6
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 
 .if defined(FETCH_MAKESUM)
 MASTER_SITES=	http://gnustep.dyndns.org/Downloads/Frameworks/
diff --git a/x11-themes/etoile-azbackground/Makefile b/x11-themes/etoile-azbackground/Makefile
index 7bae359eed75..3d12bc2243a3 100644
--- a/x11-themes/etoile-azbackground/Makefile
+++ b/x11-themes/etoile-azbackground/Makefile
@@ -25,8 +25,8 @@ USE_GNUSTEP_SYSTEM_LIBS+=	XWindowServerKit:${XWINDOWSERVERKIT_PORT}
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/AZBackground
-ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
+#ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include
+#ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 
 XWINDOWSERVERKIT_PORT?=	x11/etoile-xwindowserverkit
 
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index a62568e0e443..6439a4667ba0 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -51,8 +51,6 @@ PLIST_SUB+=		BACK=xdps-${BACKVERSION}
 PLIST_SUB+=		WITH_XLIB="@comment "
 BACK_SUFFIX?=		-xdps
 CONFLICTS?=		gunstep-back-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
-ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 .elif defined(WITH_GNUSTEP_LIBART)
 LIB_DEPENDS+=		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 CONFIGURE_ARGS+=	--enable-graphics=art --with-name=art
diff --git a/x11-wm/etoile-azalea/Makefile b/x11-wm/etoile-azalea/Makefile
index 7babdea1d806..274c39fc5231 100644
--- a/x11-wm/etoile-azalea/Makefile
+++ b/x11-wm/etoile-azalea/Makefile
@@ -25,8 +25,6 @@ USE_GNUSTEP_SYSTEM_LIBS+=	XWindowServerKit:${XWINDOWSERVERKIT_PORT}
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/Azalea
-ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 PORTSCOUT=	limit:^0\.2$$
 
 XWINDOWSERVERKIT_PORT?=		x11/etoile-xwindowserverkit
diff --git a/x11/etoile-idle/Makefile b/x11/etoile-idle/Makefile
index ee57cdac967e..22d29820aaaa 100644
--- a/x11/etoile-idle/Makefile
+++ b/x11/etoile-idle/Makefile
@@ -28,8 +28,6 @@ USE_XORG=	xscrnsaver
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/Idle
-ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	System/Tools/Idle
 
 XWINDOWSERVERKIT_PORT?=		x11/etoile-xwindowserverkit
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index df7c6d57efd9..c074e822b32b 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -26,7 +26,5 @@ USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 DEFAULT_LIBVERSION=	0.1.1
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/XWindowServerKit
-ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index 128300ccf387..a57a0cc76aed 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -22,8 +22,6 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include
-ADDITIONAL_LIB_DIRS+=	-L${LOCALBASE}/lib
 ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/GSKrabFramework/GSKrab.framework/Versions/Current
 
 .include <bsd.port.mk>