- Move LICENSE_FILE and SHEBANG_FILES out of unrelated options section

- Switch to USES=localbase
- Add missing USES=readline (for amulecmd and webserver)
- Switch to options helpers
- Fix WWW and license for amule-devel
- Fix plists for WITHOUT=NLS case: manpages are not built when NLS is disabled

PR:		234829
Submitted by:	amdmi3
Approved by:	bar (maintainer, via private email)

2 files changed, 20 insertions, 23 deletions

diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 1f61811cc5ef..02a3d8ed643c 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -12,13 +12,14 @@ MAINTAINER=	bar@FreeBSD.org
 COMMENT=	All-platform eMule p2p client
 
 LICENSE=	GPLv2+
+LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 CONFLICTS=	amule-devel-[0-9]*
 
-USES=		bison compiler:c++11-lang desktop-file-utils gmake perl5 \
-		pkgconfig shebangfix tar:xz
+USES=		bison compiler:c++11-lang desktop-file-utils gmake \
+		localbase:ldflags perl5 pkgconfig shebangfix tar:xz
 USE_PERL5=	build
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
@@ -28,9 +29,10 @@ CONFIGURE_ARGS=	--with-denoise-level=0
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
 		docdir='$${prefix}/${DOCSDIR_REL}'
 
-CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread
+
+SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
 
 OPTIONS_DEFINE=	ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
 	FILEVIEW MMAP MONOLITHIC NLS UPNP \
@@ -52,10 +54,6 @@ OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \
 
 OPTIONS_SUB=	yes
 
-SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
-
-LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
-
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 NLS_USES=	gettext
@@ -66,6 +64,7 @@ ALC_CONFIGURE_ON=	--enable-alc
 ALCC_CONFIGURE_ON=	--enable-alcc
 
 AMULECMD_CONFIGURE_ON=	--enable-amulecmd
+AMULECMD_USES=		readline
 
 AMULEDAEMON_CONFIGURE_ON=	--enable-amule-daemon
 AMULEDAEMON_USE=	RC_SUBR=amuled
@@ -76,6 +75,7 @@ CAS_CONFIGURE_ON=	--enable-cas
 CAS_LIB_DEPENDS=	libgd.so:graphics/gd
 
 ED2K_CONFIGURE_OFF=	--disable-ed2k
+ED2K_CONFLICTS=		ed2k-hash*
 
 FILEVIEW_CONFIGURE_ON=	--enable-fileview
 
@@ -87,6 +87,7 @@ UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
 
 WEBSERVER_CONFIGURE_ON=	--enable-webserver
+WEBSERVER_USES=		readline
 
 WXCAS_CONFIGURE_ON=	--enable-wxcas
 
@@ -95,10 +96,6 @@ XAS_USE=	PERL5+=run
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MED2K}
-CONFLICTS+=		ed2k-hash*
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
 		-e '/if.*test/s/==/=/' \
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index f07a79d80cfb..ccc853045a60 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -66,17 +66,17 @@
 %%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz
 %%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz
 %%NLS%%%%XAS%%man/it/man1/xas.1.gz
-%%ALC%%man/man1/alc.1.gz
-%%ALCC%%man/man1/alcc.1.gz
-%%MONOLITHIC%%man/man1/amule.1.gz
-%%AMULECMD%%man/man1/amulecmd.1.gz
-%%AMULEDAEMON%%man/man1/amuled.1.gz
-%%AMULEGUI%%man/man1/amulegui.1.gz
-%%WEBSERVER%%man/man1/amuleweb.1.gz
-%%CAS%%man/man1/cas.1.gz
-%%ED2K%%man/man1/ed2k.1.gz
-%%WXCAS%%man/man1/wxcas.1.gz
-%%XAS%%man/man1/xas.1.gz
+%%NLS%%%%ALC%%man/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/man1/xas.1.gz
 %%NLS%%%%ALC%%man/ro/man1/alc.1.gz
 %%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz
 %%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz