7 files changed, 8 insertions, 36 deletions

diff --git a/net-p2p/linux-agsatellite/Makefile b/net-p2p/linux-agsatellite/Makefile
index caeb58f690ae..d0831a85a470 100644
--- a/net-p2p/linux-agsatellite/Makefile
+++ b/net-p2p/linux-agsatellite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	agsatellite
 PORTVERSION=	0.520
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net audio linux
 MASTER_SITES=	http://www.audiogalaxy.com/downloads/
 PKGNAMEPREFIX=	linux-
@@ -16,19 +16,16 @@ DISTNAME=	AGSatellite${PORTVERSION:S/.//}-glibc21
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client that allows you to share your music on Audiogalaxy(TM)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
 WRKSRC=	${WRKDIR}/${DISTNAME:C/-.*//}
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
-STRIP=
+USE_LINUX=	yes
+USE_X_PREFIX=	yes
 RESTRICTED=	no response from developer on licensing issues
 
 DOCS=	german_readme.txt license.txt readme.txt
 
-BRANDELF=	/usr/bin/brandelf
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|
||;s|email|username|" ${WRKSRC}/*.txt
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
diff --git a/net-p2p/linux-edonkey-core/Makefile b/net-p2p/linux-edonkey-core/Makefile
index d05dda04e973..f6a53b4c3e60 100644
--- a/net-p2p/linux-edonkey-core/Makefile
+++ b/net-p2p/linux-edonkey-core/Makefile
@@ -22,7 +22,6 @@ ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-STRIP=
 
 BINARY_NAME_OLD?=	${PORTNAME}clc
 BINARY_NAME=	donkey
@@ -30,7 +29,6 @@ BINARY_NAME=	donkey
 DOC_FILES=	ChangeLog LISEZMOI README changelog.Debian.gz
 
 pre-install:
-
 	@${BRANDELF} -t Linux ${WRKSRC}/usr/bin/${BINARY_NAME_OLD}
 
 do-install:
diff --git a/net-p2p/linux-edonkey-server/Makefile b/net-p2p/linux-edonkey-server/Makefile
index 56ebe7e9fc78..d6128236f5a1 100644
--- a/net-p2p/linux-edonkey-server/Makefile
+++ b/net-p2p/linux-edonkey-server/Makefile
@@ -20,21 +20,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A decentralized peer-to-peer file-sharing server (eDonkey2000 server)
 
 ONLY_FOR_ARCHS=	i386
-USE_LINUX?=	yes
+USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-STRIP=
 #
 PKGDEINSTALL=   ${PKGINSTALL}
 
-STRIP_CMD=	${LINUXBASE}/usr/bin/strip
-
-.if exists(/usr/bin/brandelf)
-BRANDELF?=	/usr/bin/brandelf
-.else
-BRANDELF?=	brandelf
-.endif
-
 BINARY_NAME=	dserver
 RC_SAMPLE=	edonkey2000-server.sh.sample
 
@@ -57,9 +48,7 @@ do-install:
 .include <bsd.port.pre.mk>
 
 pre-install:
-.if exists(${STRIP_CMD})
 	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
 	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/linux-edonkey-tool-recovermet/Makefile b/net-p2p/linux-edonkey-tool-recovermet/Makefile
index 35befd2aae5a..06eb58419530 100644
--- a/net-p2p/linux-edonkey-tool-recovermet/Makefile
+++ b/net-p2p/linux-edonkey-tool-recovermet/Makefile
@@ -20,19 +20,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool that tries to re-create x.part.met files compromised due to crash
 
 ONLY_FOR_ARCHS=	i386
-USE_LINUX?=	yes
+USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/edonkey-tool-recovermet
-STRIP=
-
-STRIP_CMD=	${LINUXBASE}/usr/bin/strip
-
-.if exists(/usr/bin/brandelf)
-BRANDELF?=	/usr/bin/brandelf
-.else
-BRANDELF?=	brandelf
-.endif
 
 BINARY_NAME=	${PORTNAME}${PKGNAMESUFFIX}
 
diff --git a/net-p2p/linux-jigdo/Makefile b/net-p2p/linux-jigdo/Makefile
index ca49a96551eb..75b3b712141b 100644
--- a/net-p2p/linux-jigdo/Makefile
+++ b/net-p2p/linux-jigdo/Makefile
@@ -21,9 +21,8 @@ RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	YES
-USE_LINUX?=	yes
+USE_LINUX=	yes
 NO_BUILD=	yes
-STRIP=
 
 PROGRAMS=	jigdo-file
 SCRIPTS=	jigdo-lite jigdo-mirror
@@ -31,7 +30,7 @@ SCRIPTS=	jigdo-lite jigdo-mirror
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
 pre-install:
-	@brandelf -t Linux ${WRKSRC}/jigdo-file
+	@${BRANDELF} -t Linux ${WRKSRC}/jigdo-file
 
 do-install:
 .for i in ${PROGRAMS}
diff --git a/net-p2p/linux-overnet-core/Makefile b/net-p2p/linux-overnet-core/Makefile
index 512dd38ea104..6ee5d30d3cfe 100644
--- a/net-p2p/linux-overnet-core/Makefile
+++ b/net-p2p/linux-overnet-core/Makefile
@@ -18,10 +18,9 @@ MAINTAINER=	arundel@h3c.de
 COMMENT=	Overnet 'core' command line client
 
 ONLY_FOR_ARCHS=	i386
-USE_LINUX?=	yes
+USE_LINUX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-STRIP=
 
 BINARY_NAME_OLD?=	${PORTNAME}clc
 TARGET_DIR=	${PORTNAME}
diff --git a/net-p2p/peercast/Makefile b/net-p2p/peercast/Makefile
index 2886103c43d5..d48dbd357d3c 100644
--- a/net-p2p/peercast/Makefile
+++ b/net-p2p/peercast/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A peer-to-peer network for broadcasting and listening to streams
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-STRIP=		# empty: do not strip linux binaries
 
 SUB_FILES=	peercast.sh