Index: head/net-p2p/mldonkey/Makefile =================================================================== --- head/net-p2p/mldonkey/Makefile (revision 313612) +++ head/net-p2p/mldonkey/Makefile (revision 313613) @@ -1,185 +1,172 @@ # Created by: Holger Lamm # $FreeBSD$ PORTNAME= mldonkey -PORTVERSION= 3.1.2 -PORTREVISION?= 1 +PORTVERSION= 3.1.3 CATEGORIES+= net-p2p MASTER_SITES= SF MAINTAINER?= ports@FreeBSD.org COMMENT?= A OCAML client for multiple peer-to-peer networks LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/Copying.txt BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml NO_LATEST_LINK= yes CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]* USE_BZIP2= yes USE_ICONV= yes USE_AUTOTOOLS= autoconf:env GNU_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV+= OCAMLRUNPARAM="l=256M" MAKE_JOBS_UNSAFE= yes -CONFIGURE_ARGS+=--enable-ocamlver=3 \ - --with-libiconv-prefix=${LOCALBASE} +CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} CONFIGURE_ENV+= NEWCXX="${CXX}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="-pthread" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib 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)) CONFLICTS+= mldonkey-core-[0.9]* CONFLICTS+= mldonkey-gui-[0.9]* PLIST_SUB+= CORE="" GUI="" GUICORE="" .else # (defined(WITHOUT_GUI) || defined(WITHOUT_CORE)) . if defined(WITHOUT_GUI) PKGNAMESUFFIX= -core CONFLICTS+= mldonkey-gui-[0.9]* CONFIGURE_ARGS+=--disable-gui PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " . endif # defined(WITHOUT_GUI) . if defined(WITHOUT_CORE) PKGNAMESUFFIX= -gui CONFLICTS+= mldonkey-core-[0.9]* PLIST_SUB+= CORE="@comment " GUI="" GUICORE="@comment " . endif # defined(WITHOUT_CORE) .endif # !(defined(WITHOUT_GUI) || defined(WITHOUT_CORE)) .if !defined(WITHOUT_GUI) BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 LIB_DEPENDS+= rsvg-2:${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) .if !defined(WITHOUT_CORE) USE_RC_SUBR= mlnet SUB_LIST+= SH=${SH:Q} . if !defined(WITHOUT_GD) LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd . else CONFIGURE_ARGS+=--disable-gd . endif .endif DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt \ Install.txt Todo.txt ed2k_links.txt PORTDOCS= ${DOCFILES} # build additional tools ALL_TARGET+= \ mld_hash .include 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}|" \ -e "s|%%SH%%|${SH}|" \ ${FILESDIR}/wrapper.sh > \ ${WRKDIR}/wrapper.sh @${REINPLACE_CMD} -E \ -e 's|%%AUTOCONF%%|${AUTOCONF}|' \ - -e 's/-O6//' \ ${BUILD_WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -E \ -e 's@(\+)(lablgtk2)@\1site-lib/\2@' \ -e 's@(\+)(labl\$$\(GTK\))@\1site-lib/\2@' \ -e 's@(OCAMLLIB/)(\$$LABLGTK_NAME)@\1site-lib/\2@' \ ${WRKSRC}/config/configure.in \ ${WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -E \ -e 's@(#include <)(lablgtk2/)@\1site-lib/\2@' \ ${WRKSRC}/src/gtk2/gui/x11/systraystubs.c # update server.met provider -.for file in \ - src/daemon/common/commonOptions.ml \ - src/networks/donkey/donkeyServers.ml @${REINPLACE_CMD} -E \ -e 's|http://www.gruk.org/server.met.gz|http://www.jd2k.com/server.met|' \ -e 's|http://www.bluetack.co.uk/config/antip2p.txt|http://www.bluetack.co.uk/config/level1.gz|' \ - ${WRKSRC}/${file} -.endfor + ${WRKSRC}/src/daemon/common/commonOptions.ml \ + ${WRKSRC}/src/networks/donkey/donkeyServers.ml pre-configure: @cd ${WRKSRC}/config && ${AUTOCONF} - -post-configure: - @${REINPLACE_CMD} -E \ - -e 's|^(PTHREAD_CFLAGS[^=]*=).*$$|\1${PTHREAD_CFLAGS}|' \ - -e 's|^(PTHREAD_LIBS[^=]*=).*$$|\1${PTHREAD_LIBS}|' \ - ${BUILD_WRKSRC}/config/Makefile.config 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} .endfor .endif post-install: @${CAT} ${PKGMESSAGE} install-user: extract .if !defined(LANG) @${ECHO_MSG} "Please call as: make install-user LANG=" @${ECHO_MSG} "with one of en,de,fr,fr.noaccents,sp !" .else @${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\ ${HOME}/.mldonkey_gui_messages.ini .endif .include Index: head/net-p2p/mldonkey/distinfo =================================================================== --- head/net-p2p/mldonkey/distinfo (revision 313612) +++ head/net-p2p/mldonkey/distinfo (revision 313613) @@ -1,2 +1,2 @@ -SHA256 (mldonkey-3.1.2.tar.bz2) = 72728ef8c482dda8be48b6ac977d20e72eb5f84b08236a67202edcd7569c5fc6 -SIZE (mldonkey-3.1.2.tar.bz2) = 2844260 +SHA256 (mldonkey-3.1.3.tar.bz2) = 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2 +SIZE (mldonkey-3.1.3.tar.bz2) = 2848964 Property changes on: head/net-p2p/mldonkey/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c =================================================================== --- head/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c (revision 313612) +++ head/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c (nonexistent) @@ -1,23 +0,0 @@ ---- src/utils/lib/stubs_c.c.orig Wed Jan 4 12:23:37 2006 -+++ src/utils/lib/stubs_c.c Mon Jan 16 14:14:38 2006 -@@ -28,6 +28,11 @@ - #include - #endif - -+/* For proper FreeBSD version identification */ -+#if defined(HAVE_SYS_PARAM_H) -+#include -+#endif -+ - #define lseek XXXXXXXXX - #define read XXXXXXXXX - #define ftruncate XXXXXXXXX -@@ -683,7 +688,7 @@ - - #define NETDB_BUFFER_SIZE 10000 - --#ifdef _WIN32 -+#if defined(_WIN32) || ( defined(__FreeBSD_version) && ( ((__FreeBSD_version >= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) ) - #define GETHOSTBYADDR_IS_REENTRANT 1 - #define GETHOSTBYNAME_IS_REENTRANT 1 - #endif Property changes on: head/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net-p2p/mldonkey-core/Makefile =================================================================== --- head/net-p2p/mldonkey-core/Makefile (revision 313612) +++ head/net-p2p/mldonkey-core/Makefile (revision 313613) @@ -1,13 +1,11 @@ # Created by: Holger Lamm and Mario S F Ferreira # $FreeBSD$ # build only the CORE WITHOUT_GUI= yes -PORTREVISION= 0 - COMMENT= Client 'core' for the MLDonkey peer-to-peer network MASTERDIR= ${.CURDIR}/../mldonkey .include "${MASTERDIR}/Makefile"