Date: Mon, 21 Jul 2014 08:07:27 +0000 (UTC) From: Yen-Ming Lee <leeym@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362404 - in head/net-p2p: mldonkey mldonkey-core mldonkey-gui mldonkey/files Message-ID: <201407210807.s6L87RgK089890@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: leeym Date: Mon Jul 21 08:07:26 2014 New Revision: 362404 URL: http://svnweb.freebsd.org/changeset/ports/362404 QAT: https://qat.redports.org/buildarchive/r362404/ Log: - update to 3.1.5 - support stage and options Deleted: head/net-p2p/mldonkey/files/patch-src-utils-lib-CryptoPP.h Modified: head/net-p2p/mldonkey-core/Makefile head/net-p2p/mldonkey-gui/Makefile head/net-p2p/mldonkey/Makefile head/net-p2p/mldonkey/distinfo Modified: head/net-p2p/mldonkey-core/Makefile ============================================================================== --- head/net-p2p/mldonkey-core/Makefile Mon Jul 21 08:01:02 2014 (r362403) +++ head/net-p2p/mldonkey-core/Makefile Mon Jul 21 08:07:26 2014 (r362404) @@ -1,12 +1,10 @@ # Created by: Holger Lamm <holger@e-gitt.net> and Mario S F Ferreira <lioux@FreeBSD.org> # $FreeBSD$ -# build only the CORE -WITHOUT_GUI= yes +OPTIONS_EXCLUDE=GUI COMMENT= Client 'core' for the MLDonkey peer-to-peer network MASTERDIR= ${.CURDIR}/../mldonkey -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net-p2p/mldonkey-gui/Makefile ============================================================================== --- head/net-p2p/mldonkey-gui/Makefile Mon Jul 21 08:01:02 2014 (r362403) +++ head/net-p2p/mldonkey-gui/Makefile Mon Jul 21 08:07:26 2014 (r362404) @@ -1,14 +1,10 @@ # Created by: Holger Lamm <holger@e-gitt.net> # $FreeBSD$ -# build only the GUI -WITHOUT_CORE= yes -# unbreak index build with a common variable -.undef WITHOUT_GUI +OPTIONS_EXCLUDE=CORE COMMENT= OCAML/GTK GUI for the MLdonkey peer-to-peer network client MASTERDIR= ${.CURDIR}/../mldonkey -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net-p2p/mldonkey/Makefile ============================================================================== --- head/net-p2p/mldonkey/Makefile Mon Jul 21 08:01:02 2014 (r362403) +++ head/net-p2p/mldonkey/Makefile Mon Jul 21 08:07:26 2014 (r362404) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mldonkey -PORTVERSION= 3.1.3 -PORTREVISION= 1 +PORTVERSION= 3.1.5 CATEGORIES+= net-p2p MASTER_SITES= SF @@ -36,74 +35,70 @@ SUB_FILES= pkg-message ### ## Options activation ### -.if defined(WITHOUT_GUI) && defined(WITHOUT_CORE) -IGNORE= cannot install: you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing -.endif -.if !(defined(WITHOUT_GUI) || defined(WITHOUT_CORE)) +OPTIONS_DEFINE= GD DOCS EXAMPLES +OPTIONS_DEFAULT=CORE GD GUI +OPTIONS_MULTI= CLIENT +OPTIONS_MULTI_CLIENT=CORE GUI +CORE_DESC= Client 'core' support + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE} CONFLICTS+= mldonkey-core-[0.9]* CONFLICTS+= mldonkey-gui-[0.9]* PLIST_SUB+= CORE="" GUI="" GUICORE="" -.else # (defined(WITHOUT_GUI) || defined(WITHOUT_CORE)) +.else # (${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}) -. if defined(WITHOUT_GUI) +. if !${PORT_OPTIONS:MGUI} PKGNAMESUFFIX= -core CONFLICTS+= mldonkey-gui-[0.9]* CONFIGURE_ARGS+=--disable-gui PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " -. endif # defined(WITHOUT_GUI) +. endif # !${PORT_OPTIONS:MGUI} -. if defined(WITHOUT_CORE) +. if !${PORT_OPTIONS:MCORE} PKGNAMESUFFIX= -gui CONFLICTS+= mldonkey-core-[0.9]* PLIST_SUB+= CORE="@comment " GUI="" GUICORE="@comment " -. endif # defined(WITHOUT_CORE) +. endif # !${PORT_OPTIONS:MCORE} -.endif # !(defined(WITHOUT_GUI) || defined(WITHOUT_CORE)) +.endif # ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE} -.if !defined(WITHOUT_GUI) +.if ${PORT_OPTIONS:MGUI} BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 LIB_DEPENDS+= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+=--enable-gui=newgui2 # we don't need lablgtk as RUN dependency, but we need gtk+glib USE_GNOME= gtk20 -.endif # !defined(WITHOUT_GUI) +.endif # ${PORT_OPTIONS:MGUI} -.if !defined(WITHOUT_CORE) +.if ${PORT_OPTIONS:MCORE} USE_RC_SUBR= mlnet SUB_LIST+= SH=${SH:Q} -. if !defined(WITHOUT_GD) +. if ${PORT_OPTIONS:MGD} LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd . else CONFIGURE_ARGS+=--disable-gd . endif .endif -DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt \ +PORTDOCS= Authors.txt Bugs.txt ChangeLog Developers.txt \ Install.txt Todo.txt ed2k_links.txt -PORTDOCS= ${DOCFILES} # build additional tools ALL_TARGET+= \ mld_hash -NO_STAGE= yes .include <bsd.port.pre.mk> -pre-everything:: -.if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE) - @${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI." - @${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE." - @${ECHO_MSG} -.endif - post-patch: @${SED} \ -e "s|%%PREFIX%%|${PREFIX}|" \ @@ -133,27 +128,27 @@ pre-configure: @cd ${WRKSRC}/config && ${AUTOCONF} do-install: -.ifndef(WITHOUT_CORE) - @${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/bin/mlnet-real - @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mlnet -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${EXAMPLESDIR} -.endif -.endif -.ifndef(WITHOUT_GUI) - @${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin -.endif -.ifndef(WITHOUT_CORE && WITHOUT_GUI) - @${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${PREFIX}/bin -.endif -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for _file in ${DOCFILES} - @${INSTALL_DATA} ${WRKSRC}/distrib/${_file} ${DOCSDIR} +.if ${PORT_OPTIONS:MCORE} + ${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${STAGEDIR}${PREFIX}/bin/mlnet-real + ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/mlnet +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${STAGEDIR}${EXAMPLESDIR} +.endif +.endif +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${STAGEDIR}${PREFIX}/bin +.endif +.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE} + ${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${STAGEDIR}${PREFIX}/bin +.endif +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for _file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/distrib/${_file} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/net-p2p/mldonkey/distinfo ============================================================================== --- head/net-p2p/mldonkey/distinfo Mon Jul 21 08:01:02 2014 (r362403) +++ head/net-p2p/mldonkey/distinfo Mon Jul 21 08:07:26 2014 (r362404) @@ -1,2 +1,2 @@ -SHA256 (mldonkey-3.1.3.tar.bz2) = 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2 -SIZE (mldonkey-3.1.3.tar.bz2) = 2848964 +SHA256 (mldonkey-3.1.5.tar.bz2) = 74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb +SIZE (mldonkey-3.1.5.tar.bz2) = 2847382
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407210807.s6L87RgK089890>