ports/66989: [PORT FIX / CLEANUP] net/amule 1.2.6_1

[Ganael LAPLANCHE]

>Number:         66989
>Category:       ports
>Synopsis:       [PORT FIX / CLEANUP] net/amule 1.2.6_1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 21 05:50:12 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ganael LAPLANCHE
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
http://www.martymac.com
>Environment:
System: FreeBSD www.martymac.com 5.1-RELEASE FreeBSD 5.1-RELEASE


>Description:
	Fixes options management in port 1.2.6 of aMule. Uses configure option to rename ed2k instead of patching.
>How-To-Repeat:
>Fix:


--------------- Patch starts here ---------------
diff -aur amule.orig/Makefile amule/Makefile
--- amule.orig/Makefile	Thu Apr  8 10:07:54 2004
+++ amule/Makefile	Fri May 21 14:17:44 2004
@@ -19,23 +19,26 @@
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG}
-
-OPTIONS=	OPTIMIZE "Build with optimization" off \
-		STATIC "Enable static linking" off \
-		RELGRP "Use release group code" off
+		--with-wxbase-config=${WX_CONFIG} \
+		--with-curl-config=${CURL_CONFIG} \
+		--program-transform-name="s/ed2k/amule-ed2k-handler/"
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
+OPTIONS=	OPTIMIZE "Build with optimization" on \
+		STATIC "Enable static linking" off
+
 WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
+CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
+
+.include <bsd.port.pre.mk>
 
 # Configure options
 .if defined(WITH_OPTIMIZE)
@@ -46,19 +49,4 @@
 CONFIGURE_ARGS+=	--enable-static
 .endif
 
-.if defined(WITH_RELGRP)
-CONFIGURE_ARGS+=	--enable-releasegrp
-.endif
-
-post-build:
-# Build the generic named ed2k binary
-# It will be installed in an adhoc fashion
-	@cd ${BUILD_WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ed2k
-
-post-install:
-# Do not install a generic named ed2k binary
-# Install it under a more specific name
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \
-		${PREFIX}/bin/amule-ed2k-handler
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Only in amule.orig/files: patch-Makefile.in
--------------- Patch ends here ---------------
>Release-Note:
>Audit-Trail:
>Unformatted: