9 files changed, 14 insertions, 13 deletions

diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 15b72dbc8a84..a29f1ca580ad 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	IglooFTP
 PORTVERSION=	0.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://littleigloo.org/pub/iglooftp/
@@ -19,6 +19,7 @@ COMMENT=	Easy to use FTP client for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
+USE_XORG=	x11 xmu
 USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ARGS=	CC=${CC} C_FLAGS="${CFLAGS}" DESTDIR=${PREFIX}
diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile
index 8121a8c8230d..713f3c101662 100644
--- a/ftp/ftptool/Makefile
+++ b/ftp/ftptool/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	serge.gagnon.1@ulaval.ca
 COMMENT=	Graphic ftp shell based on xview
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
-RUN_DEPENDS=	${X11BASE}/bin/textedit:${PORTSDIR}/editors/textedit
+RUN_DEPENDS=	${LOCALBASE}/bin/textedit:${PORTSDIR}/editors/textedit
 
 USE_IMAKE=	yes
 MAKE_ARGS=	CC=${CC}
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 12c78a030f76..4c62acaa586e 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -20,7 +20,7 @@ COMMENT=		A graphical FTP client for KDE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/ftp/linux-curl/Makefile b/ftp/linux-curl/Makefile
index 08519bc08012..ee494bbbcfb6 100644
--- a/ftp/linux-curl/Makefile
+++ b/ftp/linux-curl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Curl linux version
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=	yes
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/ftp/linux-f10-curl/Makefile b/ftp/linux-f10-curl/Makefile
index 08519bc08012..ee494bbbcfb6 100644
--- a/ftp/linux-f10-curl/Makefile
+++ b/ftp/linux-f10-curl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Curl linux version
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=	yes
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/ftp/linux-f8-curl/Makefile b/ftp/linux-f8-curl/Makefile
index 08519bc08012..ee494bbbcfb6 100644
--- a/ftp/linux-f8-curl/Makefile
+++ b/ftp/linux-f8-curl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Curl linux version
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=	yes
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/ftp/wmget/files/patch-Makefile b/ftp/wmget/files/patch-Makefile
index d74766457f62..018defc4014f 100644
--- a/ftp/wmget/files/patch-Makefile
+++ b/ftp/wmget/files/patch-Makefile
@@ -5,7 +5,7 @@
  #	make PREFIX=/opt/dockapps install
 -PREFIX=		/usr/local
 +X11BASE?=	/usr/X11R6
-+PREFIX?=	${X11BASE}
++PREFIX?=	${LOCALBASE}
  
  INSTALLDIR=	install -d -m 755
 -INSTALLBIN=	install -m 555
@@ -16,11 +16,11 @@
 +INSTALLMAN=	$(INSTALL_MAN)
 +CC?=		gcc
 +CFLAGS?=	-Wall -W
-+CFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
++CFLAGS+=	-I${LOCALBASE}/include
  # The following line is what I use during development
  #CFLAGS:=	$(CFLAGS) -Werror -g 
 -LDFLAGS=	-L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl
-+LDFLAGS+=	-L${X11BASE}/lib -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl
++LDFLAGS+=	-L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl
  DOCS=		wmget.1
  
  VERSION:=	$(shell grep '\#define WMGET_VERSION ' wmget.h \
diff --git a/ftp/wmget/files/patch-dockapp::Makefile b/ftp/wmget/files/patch-dockapp::Makefile
index e047a61e533b..bc8795eebb07 100644
--- a/ftp/wmget/files/patch-dockapp::Makefile
+++ b/ftp/wmget/files/patch-dockapp::Makefile
@@ -10,8 +10,8 @@
 -CFLAGS=		-ansi -Wall -W -Werror -g
 -LDFLAGS=	-L/usr/X11R6/lib -lXpm -lXext -lX11
 +CFLAGS?=		-ansi -Wall -W -Werror -g
-+CFLAGS+=	-I${X11BASE}/include
-+LDFLAGS=	-L${X11BASE}/lib -lXpm -lXext -lX11
++CFLAGS+=	-I${LOCALBASE}/include
++LDFLAGS=	-L${LOCALBASE}/lib -lXpm -lXext -lX11
  
  dockapp.a:	$(DAOBJS)
  		ar rcsv dockapp.a $(DAOBJS)
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile
index 305d10309bbf..c61cfe2e6f51 100644
--- a/ftp/xrmftp/Makefile
+++ b/ftp/xrmftp/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.src
 
 ALL_TARGET=	xrmftp
-CFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/X11
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/X11
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		LDFLAGS="-L/usr/lib -L${X11BASE}/lib -lm -lX11 -lforms -lXpm"
+		LDFLAGS="-L/usr/lib -L${LOCALBASE}/lib -lm -lX11 -lforms -lXpm"
 
 PORTDOCS=	CHANGES FIXED-BUGS README
 PLIST_FILES=	bin/xrmftp