- Rework OPTIONS

- Use configure option to rename ed2k binary instead of patching

PR:		ports/66989
Submitted by:	Ganael LAPLANCHE <ganael.laplanche@martymac.com> (maintainer)

2 files changed, 11 insertions, 45 deletions

diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index 478895b7c86a..e98d75f36d97 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -19,26 +19,29 @@ LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
 
 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)
+.if !defined(WITHOUT_OPTIMIZE)
 CONFIGURE_ARGS+=	--enable-optimise
 .endif
 
@@ -46,19 +49,4 @@ CONFIGURE_ARGS+=	--enable-optimise
 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>
diff --git a/net-p2p/amule1/files/patch-Makefile.in b/net-p2p/amule1/files/patch-Makefile.in
deleted file mode 100644
index 98d1cecafe4f..000000000000
--- a/net-p2p/amule1/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	Tue Feb 17 16:43:20 2004
-+++ src/Makefile.in	Tue Feb 17 16:43:42 2004
-@@ -197,7 +197,7 @@
- sysconfdir = @sysconfdir@
- systray = @systray@
- target_alias = @target_alias@
--bin_PROGRAMS = $(am__append_1) ed2k amule
-+bin_PROGRAMS = $(am__append_1) amule
- 
- BUILT_SOURCES = sys.h
- EXTRA_DIST = sys.h.in strings.en *.h pixmaps bitmaps Makengfile
-@@ -357,8 +357,8 @@
- CONFIG_CLEAN_FILES = timestamp-sys.h
- @COMPILE_CMD_TRUE@bin_PROGRAMS = amulecmd$(EXEEXT) amulecmdDLG$(EXEEXT) \
- @COMPILE_CMD_TRUE@	amuleweb$(EXEEXT) amulewebDLG$(EXEEXT) \
--@COMPILE_CMD_TRUE@	ed2k$(EXEEXT) amule$(EXEEXT)
--@COMPILE_CMD_FALSE@bin_PROGRAMS = ed2k$(EXEEXT) amule$(EXEEXT)
-+@COMPILE_CMD_TRUE@	amule$(EXEEXT)
-+@COMPILE_CMD_FALSE@bin_PROGRAMS = amule$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
- am__amule_SOURCES_DIST = ListenSocket.cpp EMSocket.cpp AddFriend.cpp \