ports/112398: [PATCH] net-p2p/azureus: clean up

Alejandro Pulver alepulver at FreeBSD.org
Thu May 3 22:10:03 UTC 2007 

>Number:         112398
>Category:       ports
>Synopsis:       [PATCH] net-p2p/azureus: clean up
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 03 22:10:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alejandro Pulver
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007
    root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP



>Description:


- Use SF macro in MASTER_SITES.
- Clean up.
- Don't define unneeded (automatically set) Java variables.
- Use SUB_FILES and SUB_LIST instead of custom target.


>How-To-Repeat:





>Fix:


--- azureus.diff begins here ---
Index: azureus/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/azureus/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- azureus/Makefile	26 Apr 2007 21:56:17 -0000	1.40
+++ azureus/Makefile	3 May 2007 17:16:23 -0000
@@ -8,36 +8,26 @@
 PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
 CATEGORIES=	net-p2p java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
 
 MAINTAINER=	rnoland at 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
 
@@ -49,42 +39,19 @@
 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=.
@@ -93,12 +60,18 @@
 .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>
Index: azureus/files/azureus
===================================================================
RCS file: azureus/files/azureus
diff -N azureus/files/azureus
--- azureus/files/azureus	4 Jan 2007 20:00:05 -0000	1.9
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net-p2p/azureus/files/azureus,v 1.9 2007/01/04 20:00:05 erwin Exp $
-
-export JAVA_VERSION
-export JAVA_OS
-
-# java
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVA_OS="%%JAVA_OS%%"
-
-ECLIPSE_BASE=%%LOCALBASE%%/eclipse
-ECLIPSE_SWT_JAR=%%SWTJAR%%
-LIB_PATH=%%LIBDIR%%
-
-CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
-
-if [ "${DEBUG}" ]
-then
-	echo "ECLIPSE_BASE = ${ECLIPSE_BASE}"
-	echo "ECLIPSE_WS = ${ECLIPSE_WS}"
-	echo "ECLIPSE_SWT = ${ECLIPSE_SWT}"
-	echo "ECLIPSE_SWT_JAR = ${ECLIPSE_SWT_JAR}"
-	echo "CLASS_PATH = ${CLASS_PATH}"
-	echo "LIB_PATH = ${LIB_PATH}"
-fi
-
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
Index: azureus/files/azureus.in
===================================================================
RCS file: azureus/files/azureus.in
diff -N azureus/files/azureus.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ azureus/files/azureus.in	3 May 2007 17:16:23 -0000
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net-p2p/azureus/files/azureus,v 1.9 2007/01/04 20:00:05 erwin Exp $
+
+# java
+export JAVA_VERSION="%%JAVA_VERSION%%"
+export JAVA_OS="%%JAVA_OS%%"
+
+ECLIPSE_BASE=%%LOCALBASE%%/eclipse
+ECLIPSE_SWT_JAR=%%SWTJAR%%
+LIB_PATH=%%LIBDIR%%
+
+CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
+
+if [ "${DEBUG}" ]
+then
+	echo "ECLIPSE_BASE = ${ECLIPSE_BASE}"
+	echo "ECLIPSE_WS = ${ECLIPSE_WS}"
+	echo "ECLIPSE_SWT = ${ECLIPSE_SWT}"
+	echo "ECLIPSE_SWT_JAR = ${ECLIPSE_SWT_JAR}"
+	echo "CLASS_PATH = ${CLASS_PATH}"
+	echo "LIB_PATH = ${LIB_PATH}"
+fi
+
+exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
--- azureus.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list