On Tue, Aug 18, 2015 at 12:42 PM, David Coppa <dco...@gmail.com> wrote: > > Hi, > > As prompted by aja some time ago... > > Does the diff below look ok? > > Ciao! > David
comments and/or OKs, please... > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/amule/Makefile,v > retrieving revision 1.49 > diff -u -p -u -p -r1.49 Makefile > --- Makefile 4 Aug 2015 06:43:23 -0000 1.49 > +++ Makefile 18 Aug 2015 10:37:04 -0000 > @@ -6,9 +6,9 @@ COMMENT-daemon =stand-alone daemon/cmdli > > V = 2.3.1 > DISTNAME = aMule-$V > -REVISION-main = 19 > -REVISION-web = 18 > -REVISION-daemon =18 > +REVISION-main = 20 > +REVISION-web = 19 > +REVISION-daemon =19 > CATEGORIES = net > > HOMEPAGE = http://www.amule.org/ > @@ -26,9 +26,7 @@ MAINTAINER = David Coppa <dcoppa@openbsd > MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=amule/} > EXTRACT_SUFX = .tar.xz > > -.if defined (SUBPACKAGE) && ${SUBPACKAGE:M-main} > -MODULES += converters/libiconv > -.endif > +MODULES = devel/gettext > > LIB_DEPENDS = > WANTLIB = > @@ -36,8 +34,7 @@ RUN_DEPENDS = > > # bison needed if .y files are patched > BUILD_DEPENDS = devel/bison \ > - devel/flex \ > - devel/gettext-tools > + devel/flex > > commonLIB_DEPENDS = x11/wxWidgets>=2.8.12 \ > net/libupnp>=1.6.6 > Index: patches/patch-m4_gettext_m4 > =================================================================== > RCS file: patches/patch-m4_gettext_m4 > diff -N patches/patch-m4_gettext_m4 > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-m4_gettext_m4 18 Aug 2015 10:37:04 -0000 > @@ -0,0 +1,21 @@ > +$OpenBSD$ > +--- m4/gettext.m4.orig Fri Nov 11 21:59:19 2011 > ++++ m4/gettext.m4 Tue Aug 18 11:41:52 2015 > +@@ -265,7 +265,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext] > + if test "$gt_use_preinstalled_gnugettext" = "yes"; then > + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then > + AC_MSG_CHECKING([how to link with libintl]) > +- AC_MSG_RESULT([$LIBINTL]) > ++ AC_MSG_RESULT([$LTLIBINTL]) > + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) > + fi > + > +@@ -315,7 +315,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext] > + ]) > + > + dnl For backward compatibility. Some Makefiles may be using this. > +- INTLLIBS="$LIBINTL" > ++ INTLLIBS="$LTLIBINTL" > + AC_SUBST(INTLLIBS) > + > + dnl Make all documented variables known to autoconf. > Index: patches/patch-m4_iconv_m4 > =================================================================== > RCS file: patches/patch-m4_iconv_m4 > diff -N patches/patch-m4_iconv_m4 > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-m4_iconv_m4 18 Aug 2015 10:37:04 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- m4/iconv.m4.orig Tue Aug 18 09:46:11 2015 > ++++ m4/iconv.m4 Tue Aug 18 09:48:27 2015 > +@@ -62,7 +62,7 @@ AC_DEFUN([AM_ICONV_LINK], > + fi > + if test "$am_cv_lib_iconv" = yes; then > + AC_MSG_CHECKING([how to link with libiconv]) > +- AC_MSG_RESULT([$LIBICONV]) > ++ AC_MSG_RESULT([$LTLIBICONV]) > + else > + dnl If $LIBICONV didn't lead to a usable library, we don't need > $INCICONV > + dnl either. > Index: patches/patch-src_webserver_src_Makefile_in > =================================================================== > RCS file: patches/patch-src_webserver_src_Makefile_in > diff -N patches/patch-src_webserver_src_Makefile_in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_webserver_src_Makefile_in 18 Aug 2015 10:37:04 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- src/webserver/src/Makefile.in.orig Tue Aug 18 10:10:54 2015 > ++++ src/webserver/src/Makefile.in Tue Aug 18 10:13:18 2015 > +@@ -364,7 +364,7 @@ amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LI > + amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY) > $(LIBPNG_CFLAGS) $(LIBUPNP_CFLAGS) > + amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common -L../../libs/ec/cpp > $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(LIBUPNP_LDFLAGS) > + amuleweb_LDADD = -lec -lmulecommon $(WXBASE_LIBS) $(BFD_LIBS) $(ZLIB_LIBS) \ > +- $(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(LIBINTL) > $(LIBUPNP_LIBS) > ++ $(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(LTLIBINTL) > $(LIBUPNP_LIBS) > + > + noinst_HEADERS = \ > + WebInterface.h \ -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
