13 files changed, 22 insertions, 31 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 22700154c2b9..774017061cf3 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	amule
+MASTER_SITES=	SF/amule
 
 PATCH_SITES=	http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
 PATCHFILES=	aMule-wx.patch?rev=1.2
@@ -23,7 +22,6 @@ LATEST_LINK=	aMule2
 CONFLICTS=	aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_WX=		2.8
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 22700154c2b9..774017061cf3 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	amule
+MASTER_SITES=	SF/amule
 
 PATCH_SITES=	http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
 PATCHFILES=	aMule-wx.patch?rev=1.2
@@ -23,7 +22,6 @@ LATEST_LINK=	aMule2
 CONFLICTS=	aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_WX=		2.8
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index 22700154c2b9..774017061cf3 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	amule
+MASTER_SITES=	SF/amule
 
 PATCH_SITES=	http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
 PATCHFILES=	aMule-wx.patch?rev=1.2
@@ -23,7 +22,6 @@ LATEST_LINK=	aMule2
 CONFLICTS=	aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_WX=		2.8
diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile
index 806177e381c7..1461e606f9f9 100644
--- a/net-p2p/dctc-gui-qt/Makefile
+++ b/net-p2p/dctc-gui-qt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	dctc
 PORTVERSION=	0.1.2
 PORTREVISION=	3
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dc-qt
+MASTER_SITES=	SF/dc-qt
 PKGNAMESUFFIX=	-gui-qt
 DISTNAME=	dc-qt-${PORTVERSION}
 
@@ -26,7 +25,7 @@ PLIST_FILES=	bin/dc_qt
 
 OPTIONS=	XINE "Enable support for video preview using libxine" off
 
-XINE_CONFIG?=	${X11BASE}/bin/xine-config
+XINE_CONFIG?=	${LOCALBASE}/bin/xine-config
 
 .ifndef(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index f48107d4b33d..9133f04e96af 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	http://unixpages.org/distfiles/
 PKGNAMESUFFIX=	-gui
@@ -21,7 +21,6 @@ LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnome=${LOCALBASE} \
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index e0e7b9dad672..8c147c73b5c7 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	edonkey
 PORTVERSION=	0.6.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ed2k-gtk-gui
+MASTER_SITES=	SF/ed2k-gtk-gui
 PKGNAMESUFFIX=	-gui-gtk
 DISTNAME=	ed2k-gtk-gui-${PORTVERSION}
 
@@ -23,7 +22,6 @@ RUN_DEPENDS=	donkey:${PORTSDIR}/net-p2p/linux-edonkey-core
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 991dfc789fa5..1780d90eefac 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -27,7 +27,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	yes
 
 MAN1=		giftd.1
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index 9d7f3981b171..4b571dcd5a6e 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -19,7 +19,7 @@ COMMENT=	GKrellM2 plugin that monitors active giFT transfers
 
 LIB_DEPENDS=	gift.0:${PORTSDIR}/net-p2p/gift
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index a483dc62f509..558c3a912827 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Shows current mldonkey donwload/upload rates and allows setting them
 
 BUILD_DEPENDS=	\
 		pkg-config:${PORTSDIR}/devel/pkg-config \
-		${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+		${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 USE_BZIP2=	yes
@@ -27,9 +27,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -E \
-		-e 's|^(LFLAGS).*|\1 = ${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib|' \
+		-e 's|^(LFLAGS).*|\1 = ${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib|' \
 		-e 's|-lpthread|${PTHREAD_LIBS}|' \
-		-e 's|(-fPIC)|\1 ${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include|' \
+		-e 's|(-fPIC)|\1 ${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include|' \
 		${WRKSRC}/Makefile.in
 
 do-install:
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 5c90a8c95b30..3f966aecb479 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--program-transform-name=''
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=	kmldonkey.1 kmldonkey_submit.1
 
diff --git a/net-p2p/libpdtp/Makefile b/net-p2p/libpdtp/Makefile
index 07fa9a0dba92..51e7c3f207d9 100644
--- a/net-p2p/libpdtp/Makefile
+++ b/net-p2p/libpdtp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Client library for Peer Distributed Transfer Protocol (PDTP)
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 HAS_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CFLAGS+=	-fpic
 
 do-install:
diff --git a/net-p2p/linux-agsatellite/Makefile b/net-p2p/linux-agsatellite/Makefile
index 910e22849edf..e07233114e47 100644
--- a/net-p2p/linux-agsatellite/Makefile
+++ b/net-p2p/linux-agsatellite/Makefile
@@ -20,7 +20,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME:C/-.*//}
 
 NO_BUILD=	yes
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 RESTRICTED=	no response from developer on licensing issues
 
 DOCS=	german_readme.txt license.txt readme.txt
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index cf26d344e011..b31afdd0d122 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	valknut
 PORTVERSION=	0.3.13
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	wxdcgui
@@ -19,12 +20,12 @@ LIB_DEPENDS=	dc.0:${PORTSDIR}/net-p2p/dclib \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_QT_VER=	3
+USE_XORG=	x11 ice xext
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libdc=${LOCALBASE} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS=	--with-libdc=${LOCALBASE}
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}