From owner-svn-ports-head@FreeBSD.ORG Sun Dec 2 13:59:12 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0D26F2E2; Sun, 2 Dec 2012 13:59:12 +0000 (UTC) (envelope-from bar@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E49328FC08; Sun, 2 Dec 2012 13:59:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB2DxBsK083003; Sun, 2 Dec 2012 13:59:11 GMT (envelope-from bar@svn.freebsd.org) Received: (from bar@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB2DxBgG083001; Sun, 2 Dec 2012 13:59:11 GMT (envelope-from bar@svn.freebsd.org) Message-Id: <201212021359.qB2DxBgG083001@svn.freebsd.org> From: Barbara Guida Date: Sun, 2 Dec 2012 13:59:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308108 - head/net-p2p/amule X-SVN-Group: ports-head 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.14 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: Sun, 02 Dec 2012 13:59:12 -0000 Author: bar Date: Sun Dec 2 13:59:11 2012 New Revision: 308108 URL: http://svnweb.freebsd.org/changeset/ports/308108 Log: - Trim Makefile headers - Convert to OptionsNG - Strip ABI version from LIB_DEPENDS - Update my email address Approved by: rene (mentor) Feature safe: yes Modified: head/net-p2p/amule/Makefile head/net-p2p/amule/Makefile.man Modified: head/net-p2p/amule/Makefile ============================================================================== --- head/net-p2p/amule/Makefile Sun Dec 2 13:57:57 2012 (r308107) +++ head/net-p2p/amule/Makefile Sun Dec 2 13:59:11 2012 (r308108) @@ -1,9 +1,5 @@ -# New ports collection makefile for: amule -# Date created: Wed Nov 05 09:30:00 UTC 2003 -# Whom: Ganael LAPLANCHE -# +# Created by: Ganael LAPLANCHE # $FreeBSD$ -# PORTNAME= amule PORTVERSION= 2.3.1 @@ -12,7 +8,7 @@ CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} -MAINTAINER= barbara.xxx1975@libero.it +MAINTAINER= bar@FreeBSD.org COMMENT= The all-platform eMule p2p client LICENSE= GPLv2 GPLv3 @@ -20,11 +16,11 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING -CONFLICTS= amule-devel-[0-9]* - BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textproc/flex \ ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp +CONFLICTS= amule-devel-[0-9]* + USE_BZIP2= yes USE_BISON= build USE_GNOME= pkgconfig @@ -41,23 +37,25 @@ CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -OPTIONS= ALC "Compile aMule Link Creator for GUI" on \ - ALCC "Compile aMule Link Creator for console" on \ - AMULECMD "Compile aMule command line client" on \ - AMULEDAEMON "Compile aMule daemon version" on \ - AMULEGUI "Compile aMule remote GUI" on \ - CAS "Compile aMule Statistics for console" on \ - ED2K "Compile aMule ed2k links handler" on \ - FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" on \ - GEOIP "Enable GeoIP IP2Country support" off \ - MMAP "Enable using mapped memory" off \ - MONOLITHIC "Compile monolithic aMule" on \ - PLASMAMULE "Compile aMule plasma applet and engine" off \ - UPNP "Enable Universal Plug and Play support" off \ - WEBSERVER "Compile aMule WebServer" on \ - WXCAS "Compile aMule Statistics for GUI" on \ - WXUNICODE "Enable Unicode support" on \ - XAS "Install XChat2 plugin" on +OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DOCS ED2K \ + FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \ + WEBSERVER WXCAS WXUNICODE XAS +ALC_DESC= Compile aMule Link Creator for GUI +ALCC_DESC= Compile aMule Link Creator for console +AMULECMD_DESC= Compile aMule command line client +AMULEDAEMON_DESC= Compile aMule daemon version +AMULEGUI_DESC= Compile aMule remote GUI +CAS_DESC= Compile aMule Statistics for console +ED2K_DESC= Compile aMule ed2k links handler +FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) +MMAP_DESC= Use mapped memory +MONOLITHIC_DESC= Compile monolithic aMule +PLASMAMULE_DESC= Compile aMule plasma applet and engine +WXCAS_DESC= Compile aMule Statistics for GUI +WXUNICODE_DESC= Unicode support +XAS_DESC= Install XChat2 plugin +OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ + FILEVIEW MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt INSTALL README TODO \ amulesig.txt license.txt @@ -67,11 +65,11 @@ PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config .include -.if !defined(WITH_DEBUG) +.if empty(PORT_OPTIONS:MDEBUG) CONFIGURE_ARGS+=--disable-debug .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -79,7 +77,7 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.if !defined(WITHOUT_ALC) +.if ${PORT_OPTIONS:MALC} CONFIGURE_ARGS+= --enable-alc PLIST_SUB+= ALC="" .else @@ -87,7 +85,7 @@ CONFIGURE_ARGS+= --disable-alc PLIST_SUB+= ALC="@comment " .endif -.if !defined(WITHOUT_ALCC) +.if ${PORT_OPTIONS:MALCC} CONFIGURE_ARGS+= --enable-alcc PLIST_SUB+= ALCC="" .else @@ -95,7 +93,7 @@ CONFIGURE_ARGS+= --disable-alcc PLIST_SUB+= ALCC="@comment " .endif -.if !defined(WITHOUT_AMULECMD) +.if ${PORT_OPTIONS:MAMULECMD} CONFIGURE_ARGS+= --enable-amulecmd PLIST_SUB+= AMULECMD="" .else @@ -103,7 +101,7 @@ CONFIGURE_ARGS+= --disable-amulecmd PLIST_SUB+= AMULECMD="@comment " .endif -.if !defined(WITHOUT_AMULEDAEMON) +.if ${PORT_OPTIONS:MAMULEDAEMON} CONFIGURE_ARGS+= --enable-amule-daemon PLIST_SUB+= AMULEDAEMON="" USE_RC_SUBR= amuled @@ -112,7 +110,7 @@ CONFIGURE_ARGS+= --disable-amule-daemon PLIST_SUB+= AMULEDAEMON="@comment " .endif -.if !defined(WITHOUT_AMULEGUI) +.if ${PORT_OPTIONS:MAMULEGUI} CONFIGURE_ARGS+= --enable-amule-gui PLIST_SUB+= AMULEGUI="" .else @@ -120,16 +118,16 @@ CONFIGURE_ARGS+= --disable-amule-gui PLIST_SUB+= AMULEGUI="@comment " .endif -.if !defined(WITHOUT_CAS) +.if ${PORT_OPTIONS:MCAS} CONFIGURE_ARGS+= --enable-cas -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd PLIST_SUB+= CAS="" .else CONFIGURE_ARGS+= --disable-cas PLIST_SUB+= CAS="@comment " .endif -.if !defined(WITHOUT_ED2K) +.if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* CONFIGURE_ARGS+= --enable-ed2k PLIST_SUB+= ED2K="" @@ -138,7 +136,7 @@ CONFIGURE_ARGS+= --disable-ed2k PLIST_SUB+= ED2K="@comment " .endif -.if !defined(WITHOUT_FILEVIEW) +.if ${PORT_OPTIONS:MFILEVIEW} CONFIGURE_ARGS+= --enable-fileview PLIST_SUB+= FILEVIEW="" .else @@ -146,20 +144,20 @@ CONFIGURE_ARGS+= --disable-fileview PLIST_SUB+= FILEVIEW="@comment " .endif -.if !defined(WITHOUT_GEOIP) +.if ${PORT_OPTIONS:MGEOIP} CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP +LIB_DEPENDS+= GeoIP:${PORTSDIR}/net/GeoIP .else CONFIGURE_ARGS+= --disable-geoip .endif -.if !defined(WITHOUT_MMAP) +.if ${PORT_OPTIONS:MMMAP} CONFIGURE_ARGS+= --enable-mmap .else CONFIGURE_ARGS+= --disable-mmap .endif -.if !defined(WITHOUT_MONOLITHIC) +.if ${PORT_OPTIONS:MMONOLITHIC} CONFIGURE_ARGS+= --enable-monolithic PLIST_SUB+= MONOLITHIC="" .else @@ -167,7 +165,7 @@ CONFIGURE_ARGS+= --disable-monolithic PLIST_SUB+= MONOLITHIC="@comment " .endif -.if !defined(WITHOUT_PLASMAMULE) +.if ${PORT_OPTIONS:MPLASMAMULE} CONFIGURE_ENV+= ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true @@ -180,13 +178,13 @@ CONFIGURE_ARGS+= --disable-plasmamule PLIST_SUB+= PLASMAMULE="@comment " .endif -.if !defined(WITHOUT_UPNP) -LIB_DEPENDS+= upnp.9:${PORTSDIR}/devel/upnp +.if ${PORT_OPTIONS:MUPNP} +LIB_DEPENDS+= upnp:${PORTSDIR}/devel/upnp .else CONFIGURE_ARGS+= --disable-upnp .endif -.if !defined(WITHOUT_WEBSERVER) +.if ${PORT_OPTIONS:MWEBSERVER} CONFIGURE_ARGS+= --enable-webserver PLIST_SUB+= WEBSERVER="" .else @@ -194,7 +192,7 @@ CONFIGURE_ARGS+= --disable-webserver PLIST_SUB+= WEBSERVER="@comment " .endif -.if !defined(WITHOUT_WXCAS) +.if ${PORT_OPTIONS:MWXCAS} CONFIGURE_ARGS+= --enable-wxcas PLIST_SUB+= WXCAS="" .else @@ -202,11 +200,11 @@ CONFIGURE_ARGS+= --disable-wxcas PLIST_SUB+= WXCAS="@comment " .endif -.if !defined(WITHOUT_WXUNICODE) +.if ${PORT_OPTIONS:MWXUNICODE} WX_UNICODE= yes .endif -.if !defined(WITHOUT_XAS) +.if ${PORT_OPTIONS:MXAS} CONFIGURE_ARGS+= --enable-xas PLIST_SUB+= XAS="" .else @@ -224,22 +222,22 @@ post-patch: .SILENT ${WRKSRC}/configure ${FIND} ${WRKSRC} -name \*.pl -exec ${REINPLACE_CMD} \ 's|/usr/bin/perl|${PERL}|' {} + -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in .endif -.if !defined(WITHOUT_PLASMAMULE) +.if ${PORT_OPTIONS:MPLASMAMULE} ${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \ -e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif post-install: -.if !defined(WITHOUT_FILEVIEW) +.if ${PORT_OPTIONS:MFILEVIEW} ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${PREFIX}/bin .endif .if exists(${LOCALBASE}/bin/update-desktop-database) -. if !defined(WITHOUT_PLASMAMULE) +. if ${PORT_OPTIONS:MPLASMAMULE} -update-desktop-database ${KDE4_PREFIX}/share/applications . if exists(${LOCALBASE}/bin/update-mime-database) -update-mime-database ${KDE4_PREFIX}/share/mime Modified: head/net-p2p/amule/Makefile.man ============================================================================== --- head/net-p2p/amule/Makefile.man Sun Dec 2 13:57:57 2012 (r308107) +++ head/net-p2p/amule/Makefile.man Sun Dec 2 13:59:11 2012 (r308108) @@ -1,38 +1,38 @@ MANLANG= "" de es fr hu it ru tr -.if !defined(WITHOUT_NLS) -. if !defined(WITHOUT_MONOLITHIC) +.if ${PORT_OPTIONS:MNLS} +. if ${PORT_OPTIONS:MMONOLITHIC} MAN1+= amule.1 . endif -. if !defined(WITHOUT_ALC) +. if ${PORT_OPTIONS:MALC} MAN1+= alc.1 . endif -. if !defined(WITHOUT_ALCC) +. if ${PORT_OPTIONS:MALCC} MAN1+= alcc.1 . endif -. if !defined(WITHOUT_AMULECMD) +. if ${PORT_OPTIONS:MAMULECMD} MAN1+= amulecmd.1 . endif -. if !defined(WITHOUT_AMULEDAEMON) +. if ${PORT_OPTIONS:MAMULEDAEMON} MAN1+= amuled.1 . endif -. if !defined(WITHOUT_AMULEGUI) +. if ${PORT_OPTIONS:MAMULEGUI} MAN1+= amulegui.1 . endif -. if !defined(WITHOUT_CAS) +. if ${PORT_OPTIONS:MCAS} MAN1+= cas.1 . endif -. if !defined(WITHOUT_ED2K) +. if ${PORT_OPTIONS:MED2K} MAN1+= ed2k.1 . endif -. if !defined(WITHOUT_WEBSERVER) +. if ${PORT_OPTIONS:MWEBSERVER} MAN1+= amuleweb.1 . endif -. if !defined(WITHOUT_WXCAS) +. if ${PORT_OPTIONS:MWXCAS} MAN1+= wxcas.1 . endif -.endif # !WITHOUT_NLS +.endif -.if !defined(WITHOUT_XAS) +.if ${PORT_OPTIONS:MXAS} MAN1+= xas.1 .endif