From owner-svn-ports-head@freebsd.org Tue Apr 17 14:21:59 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48087FA6E7E; Tue, 17 Apr 2018 14:21:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E50D077EE6; Tue, 17 Apr 2018 14:21:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD1755B96; Tue, 17 Apr 2018 14:21:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3HELwZS070341; Tue, 17 Apr 2018 14:21:58 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3HELweQ070339; Tue, 17 Apr 2018 14:21:58 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201804171421.w3HELweQ070339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 17 Apr 2018 14:21:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467609 - head/net-p2p/amule X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/net-p2p/amule X-SVN-Commit-Revision: 467609 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2018 14:21:59 -0000 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@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 -.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 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/