Bugfix update to mldonkey-3.0.5.
Switch to new-style LIB_DEPENDS/WANTLIB. Minor style cleanups.
This commit is contained in:
dcoppa
parent
ebf21120c2
commit
842da8d68a
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.33 2010/09/17 15:58:30 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.34 2010/10/11 06:45:10 dcoppa Exp $
|
||||
|
||||
COMMENT = e-donkey client
|
||||
DISTNAME = mldonkey-3.0.4
|
||||
DISTNAME = mldonkey-3.0.5
|
||||
CATEGORIES = net
|
||||
|
||||
HOMEPAGE = http://mldonkey.sourceforge.net/Main_Page
|
||||
@ -16,14 +16,17 @@ PERMIT_DISTFILES_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =Yes
|
||||
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
|
||||
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
|
||||
charset expat fontconfig freetype gdk-x11-2.0 \
|
||||
gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \
|
||||
gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl jpeg m \
|
||||
pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
|
||||
pthread stdc++ pthread-stubs xcb xcb-render \
|
||||
xcb-render-util z
|
||||
|
||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
|
||||
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 bz2
|
||||
WANTLIB += c cairo charset expat fontconfig freetype gd
|
||||
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB += glitz gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += gtk-x11-2.0 iconv intl jpeg m magic pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png
|
||||
WANTLIB += pthread pthread-stubs rsvg-2 stdc++ xcb
|
||||
WANTLIB += xcb-render xcb-render-util z
|
||||
|
||||
CONFIGURE_STYLE = autoconf no-autoheader
|
||||
AUTOCONF_DIR = ${WRKSRC}/config
|
||||
AUTOCONF_VERSION = 2.61
|
||||
@ -38,17 +41,17 @@ USE_X11 = Yes
|
||||
USE_GMAKE = Yes
|
||||
MODULES = lang/ocaml
|
||||
BUILD_DEPENDS = ::x11/lablgtk2
|
||||
LIB_DEPENDS = rsvg-2::x11/gnome/librsvg \
|
||||
bz2::archivers/bzip2 \
|
||||
gd::graphics/gd \
|
||||
magic::devel/libmagic
|
||||
LIB_DEPENDS = ::x11/gnome/librsvg \
|
||||
::archivers/bzip2 \
|
||||
::graphics/gd \
|
||||
::devel/libmagic
|
||||
|
||||
FAKE_FLAGS = MODOCAML_NATIVE=${MODOCAML_NATIVE}
|
||||
NO_REGRESS = Yes
|
||||
|
||||
post-install:
|
||||
mkdir -p ${PREFIX}/share/mldonkey
|
||||
cp -R ${WRKDIST}/distrib ${PREFIX}/share/mldonkey
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/mldonkey
|
||||
cp -R ${WRKDIST}/distrib ${PREFIX}/share/mldonkey/
|
||||
@${strip_binaries}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (mldonkey-3.0.4.tar.bz2) = BqCEh039mdutTavCHphjVA==
|
||||
RMD160 (mldonkey-3.0.4.tar.bz2) = 6Y4zGe1gma8PsiZAJUfkQHEUwHQ=
|
||||
SHA1 (mldonkey-3.0.4.tar.bz2) = jZ4yrNxM2hp/8PCeBsds1YlpHT8=
|
||||
SHA256 (mldonkey-3.0.4.tar.bz2) = xg27j6UkXega61XgcUFn/3pr56MXr1+ywc2IcKqI3nI=
|
||||
SIZE (mldonkey-3.0.4.tar.bz2) = 2757488
|
||||
MD5 (mldonkey-3.0.5.tar.bz2) = 9DaELQ1iGNi3gtKB4oaZuA==
|
||||
RMD160 (mldonkey-3.0.5.tar.bz2) = JC5f8U5ZLwb4mkBmu4Ia0yKexrM=
|
||||
SHA1 (mldonkey-3.0.5.tar.bz2) = HNGxrZ97SdcXGrMAo4yVOaU5AaU=
|
||||
SHA256 (mldonkey-3.0.5.tar.bz2) = 3leCgzUOCE4U24tFhxQTxJHBzf8Qla5Hkp958JO/De0=
|
||||
SIZE (mldonkey-3.0.5.tar.bz2) = 2780580
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-config_Makefile_in,v 1.12 2010/06/04 17:28:52 avsm Exp $
|
||||
--- config/Makefile.in.orig Sat Mar 27 17:18:17 2010
|
||||
+++ config/Makefile.in Thu Jun 3 08:28:50 2010
|
||||
@@ -590,6 +590,8 @@ uninstall::
|
||||
$OpenBSD: patch-config_Makefile_in,v 1.13 2010/10/11 06:45:10 dcoppa Exp $
|
||||
--- config/Makefile.in.orig Thu Sep 16 21:17:04 2010
|
||||
+++ config/Makefile.in Sun Oct 10 22:36:43 2010
|
||||
@@ -609,6 +609,8 @@ uninstall::
|
||||
rm -f $(BINDIR)/mlnet
|
||||
rm -f $(BINDIR)/mlgui
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-config_Makefile_in,v 1.12 2010/06/04 17:28:52 avsm Exp $
|
||||
install:: opt
|
||||
mkdir -p $(DESTDIR)$(prefix)/bin
|
||||
if test -f mlnet; then \
|
||||
@@ -609,6 +611,21 @@ install:: opt
|
||||
@@ -628,6 +630,21 @@ install:: opt
|
||||
done; \
|
||||
fi
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-config_configure_in,v 1.12 2010/09/17 15:58:30 dcoppa Exp $
|
||||
--- config/configure.in.orig Sun Aug 15 17:41:00 2010
|
||||
+++ config/configure.in Fri Sep 17 12:09:17 2010
|
||||
@@ -855,7 +855,7 @@ if test "$GD" != "no"; then
|
||||
$OpenBSD: patch-config_configure_in,v 1.13 2010/10/11 06:45:10 dcoppa Exp $
|
||||
--- config/configure.in.orig Sun Sep 26 16:20:30 2010
|
||||
+++ config/configure.in Sun Oct 10 22:36:37 2010
|
||||
@@ -871,7 +871,7 @@ if test "$GD" != "no"; then
|
||||
PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags`
|
||||
LDFLAGS="$LDFLAGS $PNG_LDFLAGS"
|
||||
fi
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-config_configure_in,v 1.12 2010/09/17 15:58:30 dcoppa Exp $
|
||||
# restore variables
|
||||
LIBS=$SAVE_LIBS_PNG
|
||||
CFLAGS=$SAVE_CFLAGS_PNG
|
||||
@@ -883,7 +883,7 @@ if test "$GD" != "no"; then
|
||||
@@ -899,7 +899,7 @@ if test "$GD" != "no"; then
|
||||
GD=yes
|
||||
GD_PNG=yes
|
||||
AC_MSG_RESULT(yes)
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-src_gtk2_gui_guiHtml_ml,v 1.1 2010/09/17 15:58:30 dcoppa Exp $
|
||||
|
||||
From upstream cvs, fixes error:
|
||||
|
||||
File "src/gtk2/gui/guiHtml.ml", line 61, characters 25-30:
|
||||
Error: This expression has type (string * int) option
|
||||
but an expression was expected of type
|
||||
(string * int * (string * string) option) option
|
||||
|
||||
--- src/gtk2/gui/guiHtml.ml.orig Sat May 20 01:43:54 2006
|
||||
+++ src/gtk2/gui/guiHtml.ml Fri Sep 17 13:00:17 2010
|
||||
@@ -50,9 +50,13 @@ let user_agent =
|
||||
|
||||
let make_request url =
|
||||
let module H = Http_client in
|
||||
+ let auth = match !!O.gtk_connection_http_proxy_login with
|
||||
+ | "" -> None
|
||||
+ | _ -> Some (!!O.gtk_connection_http_proxy_login, !!O.gtk_connection_http_proxy_password)
|
||||
+ in
|
||||
let proxy =
|
||||
if !!O.gtk_connection_http_use_proxy
|
||||
- then Some (!!O.gtk_connection_http_proxy_server, !!O.gtk_connection_http_proxy_port)
|
||||
+ then Some (!!O.gtk_connection_http_proxy_server, !!O.gtk_connection_http_proxy_port, auth)
|
||||
else None
|
||||
in
|
||||
let r = {
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-src_gtk2_gui_guiOptions_ml,v 1.1 2010/09/17 15:58:30 dcoppa Exp $
|
||||
|
||||
From upstream cvs, fixes error:
|
||||
|
||||
File "src/gtk2/gui/guiHtml.ml", line 61, characters 25-30:
|
||||
Error: This expression has type (string * int) option
|
||||
but an expression was expected of type
|
||||
(string * int * (string * string) option) option
|
||||
|
||||
--- src/gtk2/gui/guiOptions.ml.orig Sun Jul 1 15:00:11 2007
|
||||
+++ src/gtk2/gui/guiOptions.ml Fri Sep 17 13:00:17 2010
|
||||
@@ -166,6 +166,16 @@ let gtk_connection_http_use_proxy = define_option curr
|
||||
"Direct TCP connections to HTTP proxy (the proxy should support CONNECT)"
|
||||
bool_option false
|
||||
|
||||
+let gtk_connection_http_proxy_login = define_option current_section
|
||||
+ ["gtk_connection_http_proxy_login"]
|
||||
+ "HTTP proxy login (leave empty if proxy doesn't require authentication)"
|
||||
+ string_option ""
|
||||
+
|
||||
+let gtk_connection_http_proxy_password = define_option current_section
|
||||
+ ["gtk_connection_http_proxy_password"]
|
||||
+ "HTTP proxy password"
|
||||
+ string_option ""
|
||||
+
|
||||
(* {Client} *)
|
||||
|
||||
let gtk_client_login = define_option current_section
|
||||
Loading…
x
Reference in New Issue
Block a user