svn commit: r467609 - head/net-p2p/amule

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Apr 17 14:21:58 2018
New Revision: 467609
URL: https://svnweb.freebsd.org/changeset/ports/467609

Log:
  - Fix LICENSE
  - Remove outdated condition
  - Switch to options helpers
  - Fix WWW
  
  Approved by:	portmgr blanket

Modified:
  head/net-p2p/amule/Makefile
  head/net-p2p/amule/pkg-descr

Modified: head/net-p2p/amule/Makefile
==============================================================================
--- head/net-p2p/amule/Makefile	Tue Apr 17 14:12:04 2018	(r467608)
+++ head/net-p2p/amule/Makefile	Tue Apr 17 14:21:58 2018	(r467609)
@@ -11,8 +11,7 @@ DISTNAME=	aMule-${PORTVERSION}
 MAINTAINER=	bar at FreeBSD.org
 COMMENT=	All-platform eMule p2p client
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
@@ -107,7 +106,7 @@ XAS_USE=	PERL5+=run
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" )
+.if ${ARCH} == "i386"
 CPPFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 .endif
 
@@ -115,23 +114,21 @@ CPPFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 CONFLICTS+=		ed2k-hash*
 .endif
 
-post-patch:	.SILENT
-	${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
+post-patch:
+	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
 		-e '/if.*test/s/==/=/' \
 		${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
+
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
 		${WRKSRC}/docs/Makefile.in
-.endif
-.if ${PORT_OPTIONS:MPLASMAMULE}
-	${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \
+
+post-patch-PLASMAMULE-on:
+	@${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \
 		-e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \
 		${WRKSRC}/src/utils/plasmamule/Makefile.in
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MFILEVIEW}
+post-install-FILEVIEW-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin
-.endif
 
 .include <bsd.port.mk>

Modified: head/net-p2p/amule/pkg-descr
==============================================================================
--- head/net-p2p/amule/pkg-descr	Tue Apr 17 14:12:04 2018	(r467608)
+++ head/net-p2p/amule/pkg-descr	Tue Apr 17 14:21:58 2018	(r467609)
@@ -3,4 +3,4 @@ aMule, the all-platform eMule p2p client
 aMule is a multiplatform fork of xMule
 client using wxWindows class library.
 
-WWW: http://www.amule.org
+WWW: http://www.amule.org/