Hi ports@,

amule still uses net/GeoIP for doing GeoIP lookups. As the functionality
isn't really useful with outdated databases, I propose to disable it and
remove the dependency on net/GeoIP. The following diff does this, and 
regenerate WANTLIB to remove GeoIP and add missing iberty.

While testing my changes, I noticed that amule always crashes on exit.
amuled also crashes consistently on startup. Just to be clear, those
crashes are *not* introduced by my proposed change. Anyone interested
in this port might want to look into fixing those.

Comments? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/amule/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile    12 Jul 2019 20:47:59 -0000      1.76
+++ Makefile    20 Dec 2019 09:33:31 -0000
@@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdli
 
 V =            2.3.2
 DISTNAME =     aMule-$V
-REVISION =     17
+REVISION =     18
 CATEGORIES =   net
 
 HOMEPAGE =     http://www.amule.org/
@@ -38,8 +38,7 @@ commonLIB_DEPENDS =   x11/wxWidgets>=3.0.4
 LIB_DEPENDS-main =     ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
                        converters/libiconv \
                        devel/cryptopp>=5.6.0 \
-                       graphics/gd \
-                       net/GeoIP
+                       graphics/gd
 
 LIB_DEPENDS-daemon =   ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
                        devel/cryptopp>=5.6.0
@@ -50,10 +49,10 @@ LIB_DEPENDS-web =   ${LIB_DEPENDS} ${commo
 RUN_DEPENDS-main =     ${RUN_DEPENDS} \
                        devel/desktop-file-utils
 
-commonWANTLIB =                c m pthread ${COMPILER_LIBCXX} \
+commonWANTLIB =                c iberty m pthread ${COMPILER_LIBCXX} \
                        z wx_baseu-3.0 wx_baseu_net-3.0
 WANTLIB-main =         ${WANTLIB} ${commonWANTLIB} \
-                       GeoIP X11 cryptopp fontconfig tiff webp \
+                       X11 cryptopp fontconfig tiff webp \
                        freetype gd iconv jpeg png wx_gtk3u_adv-3.0 
wx_gtk3u_core-3.0
 
 WANTLIB-daemon =       ${WANTLIB} ${commonWANTLIB} \
@@ -78,7 +77,6 @@ CONFIGURE_ARGS =      --disable-optimize \
                        --enable-amule-gui \
                        --enable-amulecmd \
                        --enable-cas \
-                       --enable-geoip \
                        --enable-webserver \
                        --enable-wxcas \
                        --with-denoise-level=0 \

Reply via email to