6 files changed, 78 insertions, 168 deletions

diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index 11f6bcb56335..caf3602c7178 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -9,36 +9,26 @@ PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
 PORTREVISION=	1
 CATEGORIES=	net-p2p java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
 
 MAINTAINER=	rnoland@2hip.net
 COMMENT=	A BitTorrent client written in Java
 
-BUILD_DEPENDS=	\
-		${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
+BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
-
-ONLY_FOR_ARCHS=	i386 amd64
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
+		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
+RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
 
 USE_JAVA=	yes
-JAVA_BUILD=	jdk
-JAVA_RUN=	jdk
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
 USE_ANT=	yes
-USE_JIKES=	no
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-		org/gudy/azureus2/ui/swt/Messages.java \
-		org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java \
-		org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
-		org/gudy/azureus2/ui/swt/Utils.java \
-		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
-		com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java
+		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 
 NO_WRKSUBDIR=	yes
 
@@ -50,42 +40,19 @@ OPTIONS=	SWTDEVEL "Use SWT Development port" on
 MAKE_ENV=	LANG=C
 CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} bin/${PORTNAME}
-
-do-configure:
-	${SED} -e "s+%%PREFIX%%+${PREFIX}+" -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
-		-e "s|%%LIBDIR%%|${LOCALBASE}/lib|" \
-		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
-		-e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \
-		-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
-		-e "s|%%JARFILE%%|${JARFILE}|" \
-		-e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \
-		${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
+		bin/${PORTNAME}
 
-do-install:
-	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} \
-		${JAVAJARDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+SUB_FILES=	${PORTNAME}
+SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
+		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SWTDEVEL)
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-SWT_JAR=	swt-devel.jar
+SWT=		swt-devel
 .else
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-SWT_JAR=	swt.jar
+SWT=		swt
 .endif
 
 CLASSPATH=.
@@ -94,12 +61,18 @@ CLASSPATH:=${CLASSPATH}:${jar}
 .endfor
 
 post-patch:
-	@${SED} -E \
-		-e 's|%%CLASSPATH%%|${CLASSPATH}|' \
+	@${SED} -E -e 's|%%CLASSPATH%%|${CLASSPATH}|' \
 		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
 # bash -> sh
-	@${REINPLACE_CMD} -E \
-		-e 's|/bin/bash|${SH}|' \
+	@${REINPLACE_CMD} -E -e 's|/bin/bash|${SH}|' \
 		${WRKSRC}/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
 
+do-install:
+	${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+
+post-install:
+	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/azureus2/files/azureus b/net-p2p/azureus/files/azureus.in
index 6856237034b0..dbc04f341588 100644
--- a/net-p2p/azureus2/files/azureus
+++ b/net-p2p/azureus/files/azureus.in
@@ -1,13 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD$
-
-export JAVA_VERSION
-export JAVA_OS
+# $FreeBSD: /tmp/pcvs/ports/net-p2p/azureus/files/Attic/azureus.in,v 1.1 2007-05-26 00:56:11 alepulver Exp $
 
 # java
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVA_OS="%%JAVA_OS%%"
+export JAVA_VERSION="%%JAVA_VERSION%%"
+export JAVA_OS="%%JAVA_OS%%"
 
 ECLIPSE_BASE=%%LOCALBASE%%/eclipse
 ECLIPSE_SWT_JAR=%%SWTJAR%%
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index 11f6bcb56335..caf3602c7178 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -9,36 +9,26 @@ PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
 PORTREVISION=	1
 CATEGORIES=	net-p2p java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
 
 MAINTAINER=	rnoland@2hip.net
 COMMENT=	A BitTorrent client written in Java
 
-BUILD_DEPENDS=	\
-		${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
+BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
-
-ONLY_FOR_ARCHS=	i386 amd64
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
+		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
+RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
 
 USE_JAVA=	yes
-JAVA_BUILD=	jdk
-JAVA_RUN=	jdk
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
 USE_ANT=	yes
-USE_JIKES=	no
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-		org/gudy/azureus2/ui/swt/Messages.java \
-		org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java \
-		org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
-		org/gudy/azureus2/ui/swt/Utils.java \
-		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
-		com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java
+		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 
 NO_WRKSUBDIR=	yes
 
@@ -50,42 +40,19 @@ OPTIONS=	SWTDEVEL "Use SWT Development port" on
 MAKE_ENV=	LANG=C
 CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} bin/${PORTNAME}
-
-do-configure:
-	${SED} -e "s+%%PREFIX%%+${PREFIX}+" -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
-		-e "s|%%LIBDIR%%|${LOCALBASE}/lib|" \
-		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
-		-e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \
-		-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
-		-e "s|%%JARFILE%%|${JARFILE}|" \
-		-e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \
-		${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
+		bin/${PORTNAME}
 
-do-install:
-	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} \
-		${JAVAJARDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+SUB_FILES=	${PORTNAME}
+SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
+		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SWTDEVEL)
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-SWT_JAR=	swt-devel.jar
+SWT=		swt-devel
 .else
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-SWT_JAR=	swt.jar
+SWT=		swt
 .endif
 
 CLASSPATH=.
@@ -94,12 +61,18 @@ CLASSPATH:=${CLASSPATH}:${jar}
 .endfor
 
 post-patch:
-	@${SED} -E \
-		-e 's|%%CLASSPATH%%|${CLASSPATH}|' \
+	@${SED} -E -e 's|%%CLASSPATH%%|${CLASSPATH}|' \
 		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
 # bash -> sh
-	@${REINPLACE_CMD} -E \
-		-e 's|/bin/bash|${SH}|' \
+	@${REINPLACE_CMD} -E -e 's|/bin/bash|${SH}|' \
 		${WRKSRC}/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
 
+do-install:
+	${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+
+post-install:
+	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/vuze/files/azureus b/net-p2p/azureus2/files/azureus.in
index 6856237034b0..d5735c81c0f1 100644
--- a/net-p2p/vuze/files/azureus
+++ b/net-p2p/azureus2/files/azureus.in
@@ -1,13 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD$
-
-export JAVA_VERSION
-export JAVA_OS
+# $FreeBSD: /tmp/pcvs/ports/net-p2p/azureus2/files/Attic/azureus.in,v 1.1 2007-05-26 00:56:11 alepulver Exp $
 
 # java
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVA_OS="%%JAVA_OS%%"
+export JAVA_VERSION="%%JAVA_VERSION%%"
+export JAVA_OS="%%JAVA_OS%%"
 
 ECLIPSE_BASE=%%LOCALBASE%%/eclipse
 ECLIPSE_SWT_JAR=%%SWTJAR%%
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 11f6bcb56335..caf3602c7178 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -9,36 +9,26 @@ PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
 PORTREVISION=	1
 CATEGORIES=	net-p2p java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
 
 MAINTAINER=	rnoland@2hip.net
 COMMENT=	A BitTorrent client written in Java
 
-BUILD_DEPENDS=	\
-		${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
+BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
-
-ONLY_FOR_ARCHS=	i386 amd64
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
+		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
+RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
 
 USE_JAVA=	yes
-JAVA_BUILD=	jdk
-JAVA_RUN=	jdk
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
 USE_ANT=	yes
-USE_JIKES=	no
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-		org/gudy/azureus2/ui/swt/Messages.java \
-		org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java \
-		org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
-		org/gudy/azureus2/ui/swt/Utils.java \
-		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
-		com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java
+		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 
 NO_WRKSUBDIR=	yes
 
@@ -50,42 +40,19 @@ OPTIONS=	SWTDEVEL "Use SWT Development port" on
 MAKE_ENV=	LANG=C
 CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} bin/${PORTNAME}
-
-do-configure:
-	${SED} -e "s+%%PREFIX%%+${PREFIX}+" -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
-		-e "s|%%LIBDIR%%|${LOCALBASE}/lib|" \
-		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
-		-e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \
-		-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
-		-e "s|%%JARFILE%%|${JARFILE}|" \
-		-e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \
-		${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
+		bin/${PORTNAME}
 
-do-install:
-	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} \
-		${JAVAJARDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+SUB_FILES=	${PORTNAME}
+SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
+		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SWTDEVEL)
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
-SWT_JAR=	swt-devel.jar
+SWT=		swt-devel
 .else
-BUILD_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-RUN_DEPENDS+=	\
-		${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
-SWT_JAR=	swt.jar
+SWT=		swt
 .endif
 
 CLASSPATH=.
@@ -94,12 +61,18 @@ CLASSPATH:=${CLASSPATH}:${jar}
 .endfor
 
 post-patch:
-	@${SED} -E \
-		-e 's|%%CLASSPATH%%|${CLASSPATH}|' \
+	@${SED} -E -e 's|%%CLASSPATH%%|${CLASSPATH}|' \
 		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
 # bash -> sh
-	@${REINPLACE_CMD} -E \
-		-e 's|/bin/bash|${SH}|' \
+	@${REINPLACE_CMD} -E -e 's|/bin/bash|${SH}|' \
 		${WRKSRC}/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
 
+do-install:
+	${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+
+post-install:
+	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/azureus/files/azureus b/net-p2p/vuze/files/azureus.in
index 6856237034b0..f933a7cbd926 100644
--- a/net-p2p/azureus/files/azureus
+++ b/net-p2p/vuze/files/azureus.in
@@ -1,13 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD$
-
-export JAVA_VERSION
-export JAVA_OS
+# $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/Attic/azureus.in,v 1.1 2007-05-26 00:56:11 alepulver Exp $
 
 # java
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVA_OS="%%JAVA_OS%%"
+export JAVA_VERSION="%%JAVA_VERSION%%"
+export JAVA_OS="%%JAVA_OS%%"
 
 ECLIPSE_BASE=%%LOCALBASE%%/eclipse
 ECLIPSE_SWT_JAR=%%SWTJAR%%