pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/41508: pkgsrc stub for amule 2.2.4

The following reply was made to PR pkg/41508; it has been noted by GNATS.

From: mmondor%pulsar-zone.net@localhost
To: gnats-bugs%gnats.NetBSD.org@localhost
Cc: 
Subject: Re: pkg/41508: pkgsrc stub for amule 2.2.4
Date: Fri, 29 May 2009 15:05:28 -0400

 Or in case this is considered more useful:
 
 
 Unless I'm mistaken, a quick check of the repository indicates that
 this might also apply fine on -current pkgsrc, although this diff
 was generated against pkgsrc-2009Q1.
 
 First delete patches/patch-ab,
 then apply this diff:
 
 
 Index: Makefile
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/net/amule/Makefile,v
 retrieving revision 1.37
 diff -u -r1.37 Makefile
 --- Makefile   22 Sep 2008 20:21:04 -0000      1.37
 +++ Makefile   29 May 2009 07:34:48 -0000
 @@ -1,6 +1,6 @@
  # $NetBSD: Makefile,v 1.37 2008/09/22 20:21:04 joerg Exp $
  
 -DISTNAME=     aMule-2.1.3
 +DISTNAME=     aMule-2.2.4
  PKGNAME=      ${DISTNAME:S/aMule/amule/}
  CATEGORIES=   net
  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
 @@ -17,17 +17,24 @@
  USE_DIRS+=            xdg-1.1
  USE_LANGUAGES=                c c++
  USE_PKGLOCALEDIR=     yes
 -USE_TOOLS+=           gmake intltool msgfmt pkg-config
 +USE_TOOLS+=           gmake intltool msgfmt pkg-config perl
  GNU_CONFIGURE=                yes
  CONFIGURE_ARGS+=      --with-wx-config=${LOCALBASE}/bin/wx-config
  CONFIGURE_ENV+=               gt_cv_func_gnugettext1_libintl=yes
  
 +REPLACE_PERL=         src/libs/ec/file_generator.pl\
 +                      src/utils/scripts/kadnodescreate.pl\
 +                      src/utils/scripts/stats.pl\
 +                      src/utils/scripts/mldonkey_importer.pl\
 +                      src/utils/xas/xas.pl
 +
  LIBS+=                        -lm
  
  UNLIMIT_RESOURCES+=   datasize
  
  .include "../../devel/gettext-lib/buildlink3.mk"
  .include "../../devel/zlib/buildlink3.mk"
 -.include "../../x11/wxGTK26/buildlink3.mk"
 +.include "../../x11/wxGTK28/buildlink3.mk"
 +.include "../../security/crypto++/buildlink3.mk"
  .include "../../mk/pthread.buildlink3.mk"
  .include "../../mk/bsd.pkg.mk"
 Index: PLIST
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/net/amule/PLIST,v
 retrieving revision 1.8
 diff -u -r1.8 PLIST
 --- PLIST      17 Apr 2006 07:07:30 -0000      1.8
 +++ PLIST      29 May 2009 07:11:18 -0000
 @@ -1,25 +1,16 @@
  @comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:30 jlam Exp $
  bin/amule
  bin/ed2k
 +bin/autostart-xas
  lib/xchat/plugins/xas.pl
 -man/de/man1/amule.1
 -man/de/man1/ed2k.1
  man/de/man1/xas.1
 -man/es/man1/amule.1
 -man/es/man1/ed2k.1
  man/es/man1/xas.1
 -man/fr/man1/amule.1
 -man/fr/man1/ed2k.1
 -man/hu/man1/amule.1
 -man/hu/man1/ed2k.1
 +man/eu/man1/xas.1
  man/hu/man1/xas.1
 -man/man1/amule.1
 -man/man1/ed2k.1
  man/man1/xas.1
  share/applications/amule.desktop
  share/doc/aMule-${PKGVERSION}/ABOUT-NLS
  share/doc/aMule-${PKGVERSION}/Changelog
 -share/doc/aMule-${PKGVERSION}/Doxyfile
  share/doc/aMule-${PKGVERSION}/EC_Protocol.txt
  share/doc/aMule-${PKGVERSION}/ED2K-Links.HOWTO
  share/doc/aMule-${PKGVERSION}/INSTALL
 @@ -29,39 +20,21 @@
  share/doc/aMule-${PKGVERSION}/amulesig.txt
  share/doc/aMule-${PKGVERSION}/license.txt
  share/doc/aMule-${PKGVERSION}/socks4.protocol
 -share/locale/ar/LC_MESSAGES/amule.mo
 -share/locale/bg/LC_MESSAGES/amule.mo
 -share/locale/ca/LC_MESSAGES/amule.mo
 -share/locale/da/LC_MESSAGES/amule.mo
 -share/locale/de/LC_MESSAGES/amule.mo
 -share/locale/en_GB/LC_MESSAGES/amule.mo
 -share/locale/en_US/LC_MESSAGES/amule.mo
 -share/locale/es/LC_MESSAGES/amule.mo
 -share/locale/es_MX/LC_MESSAGES/amule.mo
 -share/locale/et_EE/LC_MESSAGES/amule.mo
 -share/locale/eu/LC_MESSAGES/amule.mo
 -share/locale/fi/LC_MESSAGES/amule.mo
 -share/locale/fr/LC_MESSAGES/amule.mo
 -share/locale/gl/LC_MESSAGES/amule.mo
 -share/locale/hr/LC_MESSAGES/amule.mo
 -share/locale/hu/LC_MESSAGES/amule.mo
 -share/locale/it/LC_MESSAGES/amule.mo
 -share/locale/it_CH/LC_MESSAGES/amule.mo
 -share/locale/ko_KR/LC_MESSAGES/amule.mo
 -share/locale/nl/LC_MESSAGES/amule.mo
 -share/locale/pl/LC_MESSAGES/amule.mo
 -share/locale/pt_BR/LC_MESSAGES/amule.mo
 -share/locale/pt_PT/LC_MESSAGES/amule.mo
 -share/locale/ru/LC_MESSAGES/amule.mo
 -share/locale/sl/LC_MESSAGES/amule.mo
 -share/locale/zh_CN/LC_MESSAGES/amule.mo
 -share/locale/zh_TW/LC_MESSAGES/amule.mo
 +share/amule/skins/gnome.zip
 +share/amule/skins/kde4.zip
 +share/amule/skins/tango.zip
 +share/amule/skins/xfce.zip
  share/pixmaps/amule.xpm
  @comment in xdg-dirs: @dirrm share/pixmaps
 -@dirrm share/locale/it_CH/LC_MESSAGES
  @dirrm share/doc/aMule-${PKGVERSION}
  @comment in xdg-dirs: @dirrm share/applications
 +@dirrm man/du/man1
 +@dirrm man/es/man1
 +@dirrm man/eu/man1
  @dirrm man/hu/man1
 +@dirrm man/du
 +@dirrm man/es
 +@dirrm man/eu
  @dirrm man/hu
  @dirrm lib/xchat/plugins
  @dirrm lib/xchat
 Index: distinfo
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/net/amule/distinfo,v
 retrieving revision 1.14
 diff -u -r1.14 distinfo
 --- distinfo   14 Oct 2006 01:14:15 -0000      1.14
 +++ distinfo   29 May 2009 03:03:27 -0000
 @@ -1,7 +1,6 @@
  $NetBSD: distinfo,v 1.14 2006/10/14 01:14:15 rillig Exp $
  
 -SHA1 (aMule-2.1.3.tar.bz2) = dd47deb38e7a5b823550b85150f5a814c597b273
 -RMD160 (aMule-2.1.3.tar.bz2) = fcc345000e5ad0a221d1e96d0d514f3be36428c3
 -Size (aMule-2.1.3.tar.bz2) = 3248530 bytes
 -SHA1 (patch-aa) = 7475073572410b0368ae34d26208eab243652488
 -SHA1 (patch-ab) = df17202991dc5477feca2a0129d9703a71665869
 +SHA1 (aMule-2.2.4.tar.bz2) = 35ef66dd47a1517a84814b1a5f88bd2185601c1b
 +RMD160 (aMule-2.2.4.tar.bz2) = 5f260f9d5db9f1a97f30b6a4f829e0af95e71feb
 +Size (aMule-2.2.4.tar.bz2) = 4705472 bytes
 +SHA1 (patch-aa) = 67a3138a2a40e5853eb4ad1f4f21e5978adaf705
 Index: patches/patch-aa
 ===================================================================
 RCS file: 
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/net/amule/patches/patch-aa,v
 retrieving revision 1.8
 diff -u -r1.8 patch-aa
 --- patches/patch-aa   14 Oct 2006 01:14:15 -0000      1.8
 +++ patches/patch-aa   29 May 2009 03:02:11 -0000
 @@ -1,30 +1,11 @@
 -$NetBSD: patch-aa,v 1.8 2006/10/14 01:14:15 rillig Exp $
 -
 ---- configure.orig    2006-06-11 17:08:53.000000000 +0200
 -+++ configure 2006-10-14 03:13:01.000000000 +0200
 -@@ -8227,6 +8227,7 @@ else
 -      result="no"
 - fi
 +--- ./configure.orig  2009-05-28 22:54:55.000000000 -0400
 ++++ ./configure       2009-05-28 23:00:57.000000000 -0400
 +@@ -1998,7 +1998,7 @@
   
 -+result="yes"
 - HAVE_GETTEXT=$result
 + else
   
 - { echo "$as_me:$LINENO: result: $result ($autopoint_version)" >&5
 -@@ -18234,7 +18235,7 @@ echo $ECHO_N "checking if this is a Free
 -              { echo "$as_me:$LINENO: result: yes" >&5
 - echo "${ECHO_T}yes" >&6; }
 -      else
 --             LDFLAGS="$LDFLAGS -lpthread"
 -+             LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 -              { echo "$as_me:$LINENO: result: no" >&5
 - echo "${ECHO_T}no" >&6; }
 -      fi
 -@@ -18962,7 +18963,7 @@ case "$ccache" in
 +-                     MULELDFLAGS="$MULELDFLAGS -lpthread"
 ++                     MULELDFLAGS="$MULELDFLAGS ${PTHREAD_LDFLAGS} 
${PTHREAD_LIBS}"
 +                      echo "$as_me:$LINENO: result: no" >&5
 + echo "${ECHO_T}no" >&6
   
 - yes)
 - 
 --     if test x$ccache_prefix == x ; then
 -+     if test x$ccache_prefix = x ; then
 -              ccache_full=$(which ccache)
 -              ccache_prefix=$(dirname ${ccache_full})
 -      fi
Home | Main Index | Thread Index | Old Index