Re: patches for pkgsrc (yacc and lex tools)

To: Roland Illig <rillig%NetBSD.org@localhost>
Subject: Re: patches for pkgsrc (yacc and lex tools)
From: Aleksey Cheusov <cheusov%tut.by@localhost>
Date: Sat, 17 Nov 2007 14:15:02 +0200

> Aleksey Cheusov wrote:
 >> See the packages failures here
 >> http://mova.org/~cheusov/pub/pkgsrc-pbulk/Debian-etch/current/log//20071112.1022/meta/report.html
 >> and apply the following patches

> Patch applied. Thank you very much for doing that work.

A few other fixes for 
  audio/xmms-wma,
  lang/python20,
  lang/python23,
  multimedia/ffmpeg,
  x11/qt2-libs

Index: audio/xmms-wma/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms-wma/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- audio/xmms-wma/Makefile     4 Mar 2006 21:29:00 -0000       1.5
+++ audio/xmms-wma/Makefile     17 Nov 2007 09:07:59 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2006/03/04 21:29:00 jlam Exp $
 #
 
-DISTNAME=      xmms-wma-1.0.4
+DISTNAME=      xmms-wma-1.0.5
 PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  http://mcmcc.bat.ru/xmms-wma/
Index: audio/xmms-wma/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms-wma/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- audio/xmms-wma/distinfo     28 Jul 2007 00:56:13 -0000      1.4
+++ audio/xmms-wma/distinfo     17 Nov 2007 09:07:59 -0000
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.4 2007/07/28 00:56:13 joerg Exp $
 
-SHA1 (xmms-wma-1.0.4.tar.bz2) = b7071c6fc17b22cb861f5071c97f72f876f271f9
-RMD160 (xmms-wma-1.0.4.tar.bz2) = bd79cf369a739000facc00f59d7a0d30dab6f5eb
-Size (xmms-wma-1.0.4.tar.bz2) = 145691 bytes
+SHA1 (xmms-wma-1.0.5.tar.bz2) = 168a97e540601c7ad939a7d06ab3c23eb73ebdb9
+RMD160 (xmms-wma-1.0.5.tar.bz2) = 7c2418fce81f41bffe699e676b62fbb1ca24456a
+Size (xmms-wma-1.0.5.tar.bz2) = 146687 bytes
 SHA1 (patch-aa) = 817d7969c904d46cced1fbd93c753fa3d84f461a
 SHA1 (patch-ab) = 6a7daf57e68ca1bde8c9f9fb14af25843f5ba34e
-SHA1 (patch-ac) = 93e1fd03a950fbd995d492bda07b28ce81e339f4
+SHA1 (patch-ac) = 00bd321883d62ae73cc78f2ecfc0a44f7669f3b2
 SHA1 (patch-ad) = aee4ea1a154f71b2d4d1672bd8226ed76e0f909a
Index: audio/xmms-wma/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms-wma/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- audio/xmms-wma/patches/patch-ac     23 May 2005 08:50:36 -0000      1.2
+++ audio/xmms-wma/patches/patch-ac     17 Nov 2007 09:07:59 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-ac,v 1.2 2005/05/23 08:50:36 rillig Exp $
 
---- ffmpeg-strip-wma/asf.c.orig        Wed May 26 19:16:39 2004
-+++ ffmpeg-strip-wma/asf.c     Sat Dec 11 21:32:58 2004
+--- ffmpeg-strip-wma/asf.c.orig        2005-08-18 22:12:22.000000000 +0300
++++ ffmpeg-strip-wma/asf.c
 @@ -16,10 +16,13 @@
   * License along with this library; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -18,15 +18,16 @@
  
  #undef NDEBUG
  #include <assert.h>
-@@ -830,6 +833,7 @@
+@@ -829,7 +832,7 @@ static char *getlocale()
+ 
      return str;
  }
- 
+-
 +#ifdef USE_ICONV
- static void tag_recode(char *before, int len)
+ static void tag_recode(char *before, unsigned int len)
  {
         int result;
-@@ -859,6 +863,7 @@
+@@ -859,6 +862,7 @@ static void tag_recode(char *before, uns
                return;
         return;
  }
@@ -34,7 +35,7 @@
  
  static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int 
buf_size)
  {
-@@ -868,12 +873,17 @@
+@@ -868,12 +872,17 @@ static void get_str16_nolen(ByteIOContex
      q = buf;
      lenz = len;
      while (len > 0) {
Index: lang/python20/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python20/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- lang/python20/Makefile      2 Jul 2007 20:24:27 -0000       1.34
+++ lang/python20/Makefile      17 Nov 2007 09:09:13 -0000
@@ -27,8 +27,9 @@
 
 # Make sure having environment variable OPT doesn't affect the
 # installed module-building Makefile
+
 MAKE_ENV+=     'OPT=${CFLAGS}'
-CONFIGURE_ENV+=        'OPT=${CFLAGS}'
+CONFIGURE_ENV+=        'OPT=${CFLAGS}' 'BDB_LIBS=${BDB_LIBS}'
 
 SSLFLAGS=      -DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \
                -L${BUILDLINK_PREFIX.openssl}/lib \
Index: lang/python20/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python20/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- lang/python20/distinfo      24 Jul 2007 16:53:20 -0000      1.13
+++ lang/python20/distinfo      17 Nov 2007 09:09:13 -0000
@@ -10,7 +10,7 @@
 SHA1 (patch-ae) = e962dad92260a1f506298ba3ebb059e852c4ccf4
 SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc
 SHA1 (patch-ag) = 4b1b561832d6a044c6be0372f9f915b09fab4c3c
-SHA1 (patch-ah) = c48beff9fe4d4f61e21c0952f4a7547cae28c0bb
+SHA1 (patch-ah) = c81549e92fe55773113a1eabb45a001f24de4e16
 SHA1 (patch-ai) = 87b430f97ec258d423f7841bf369970223323a6b
 SHA1 (patch-aj) = 56e34352284a0b71fecb9b4abef8825ce4edf6d7
 SHA1 (patch-ak) = 0603b4731413bb098991f34df00c627f0b64e6df
Index: lang/python20/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python20/patches/patch-ah,v
retrieving revision 1.1
diff -u -r1.1 patch-ah
--- lang/python20/patches/patch-ah      6 Dec 2005 18:26:49 -0000       1.1
+++ lang/python20/patches/patch-ah      17 Nov 2007 09:09:13 -0000
@@ -1,6 +1,6 @@
 $NetBSD: patch-ah,v 1.1 2005/12/06 18:26:49 joerg Exp $
 
---- configure.orig     2005-12-06 18:07:36.000000000 +0000
+--- configure.orig     2001-03-31 17:48:35.000000000 +0300
 +++ configure
 @@ -2689,6 +2689,9 @@ then
                else
@@ -30,3 +30,12 @@
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
                        LINKFORSHARED="-Wl,--export-dynamic"
+@@ -3753,7 +3756,7 @@ if eval "test \"`echo '$ac_cv_func_'dbop
+   HAVE_LIBDB=
+ else
+   echo "$ac_t""no" 1>&6
+-HAVE_LIBDB=-ldb
++HAVE_LIBDB=${BDB_LIBS}
+ fi
+ 
+ fi
Index: lang/python23/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python23/Makefile.common,v
retrieving revision 1.36
diff -u -r1.36 Makefile.common
--- lang/python23/Makefile.common       2 Jul 2007 20:24:27 -0000       1.36
+++ lang/python23/Makefile.common       17 Nov 2007 09:09:13 -0000
@@ -18,6 +18,7 @@
 
 # fdatasync()
 LIBS.SunOS+=           -lrt
+LIBS+=                 ${BDB_LIBS}
 
 REPLACE_INTERPRETER+=  python
 REPLACE.python.old=    .*python
Index: multimedia/ffmpeg/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- multimedia/ffmpeg/distinfo  2 Aug 2007 21:48:33 -0000       1.13
+++ multimedia/ffmpeg/distinfo  17 Nov 2007 09:09:29 -0000
@@ -3,7 +3,7 @@
 SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3
 RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4
 Size (ffmpeg-0.4.9-pre1.tar.gz) = 1611332 bytes
-SHA1 (patch-aa) = c1cbba3599d495e70bc26edd026e18e0f5101070
+SHA1 (patch-aa) = 9211ce3acfccf8c543ffea4a99e10413742aaaea
 SHA1 (patch-ab) = 15c7def153b0854169f36ebc7c1e8ae49a0268ea
 SHA1 (patch-ac) = 176a15b8c55f14269b5cb0123b4c88a52e9de19e
 SHA1 (patch-ad) = 933d57aea5721c4562773b97086ff672bd2a4ea9
Index: multimedia/ffmpeg/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- multimedia/ffmpeg/patches/patch-aa  2 Aug 2007 21:48:34 -0000       1.6
+++ multimedia/ffmpeg/patches/patch-aa  17 Nov 2007 09:09:29 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.6 2007/08/02 21:48:34 dbj Exp $
 
---- configure.orig     2004-07-05 11:06:16.000000000 -0700
-+++ configure  2007-08-02 12:56:27.000000000 -0700
+--- configure.orig     2004-07-05 21:06:16.000000000 +0300
++++ configure
 @@ -224,11 +224,10 @@ FFSLDFLAGS=""
  need_inet_aton="yes"
  extralibs="$extralibs -lsocket -lnsl"
@@ -23,3 +23,13 @@
  SHFLAGS="-dynamiclib"
  extralibs=""
  darwin="yes"
+@@ -1140,8 +1138,8 @@ fi
+ if test "$vhook" = "yes" ; then
+   echo "BUILD_VHOOK=yes" >> config.mak
+   echo "#define HAVE_VHOOK 1" >> $TMPH
+-  extralibs="$extralibs $ldl"
+ fi
++extralibs="$extralibs $ldl"
+ if test "$lshared" = "yes" ; then
+   echo "BUILD_SHARED=yes" >> config.mak
+   echo "PIC=-fPIC" >> config.mak
Index: x11/qt2-libs/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt2-libs/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- x11/qt2-libs/distinfo       28 Sep 2007 13:11:29 -0000      1.17
+++ x11/qt2-libs/distinfo       17 Nov 2007 09:10:44 -0000
@@ -7,7 +7,7 @@
 SHA1 (patch-ab) = 1f5b23c519d011c3c96d7ebd68120351a6edc203
 SHA1 (patch-ac) = f230f0729397d642ccf6d511fb16df8800d495ba
 SHA1 (patch-ad) = eead0ed591c575ef542052bd233981dda954eb67
-SHA1 (patch-ae) = e1ef4bde84473d6b84dbd226dbd7f8802abc6b4b
+SHA1 (patch-ae) = 39df71f406159fa7f04fee4d99e121c9d76b107b
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
 SHA1 (patch-ag) = 85a6376bc780c7aad88879c70fb86542f7e738ae
 SHA1 (patch-ah) = aed767e01998aa5093e3932f6ab1032d0a35b9bb
Index: x11/qt2-libs/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt2-libs/patches/patch-ae,v
retrieving revision 1.9
diff -u -r1.9 patch-ae
--- x11/qt2-libs/patches/patch-ae       5 Feb 2003 23:13:10 -0000       1.9
+++ x11/qt2-libs/patches/patch-ae       17 Nov 2007 09:10:44 -0000
@@ -1,16 +1,7 @@
 $NetBSD: patch-ae,v 1.9 2003/02/05 23:13:10 dmcmahill Exp $
 
---- src/Makefile.in.orig       Wed Jun 13 04:57:02 2001
+--- src/Makefile.in.orig       2001-06-13 11:57:02.000000000 +0300
 +++ src/Makefile.in
-@@ -2,7 +2,7 @@
- 
- ####### Compiler, tools and options
- 
--CXX   =       $(SYSCONF_CXX) $(QT_CXX_MT)
-+CXX   =       $(SYSCONF_CXX_LIB) $(QT_CXX_MT)
- CXXFLAGS=     $(SYSCONF_CXXFLAGS_OPENGL) $(SYSCONF_CXXFLAGS_QT) 
$(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 
$(QT_CXXFLAGS_OPT)
- CC    =       $(SYSCONF_CC) $(QT_C_MT)
- CFLAGS        =       $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
 @@ -12,9 +12,12 @@ LIBS        =       $(SUBLIBS) $(SYSCONF_LIBS_OPENGL)
  MOC   =       $(SYSCONF_MOC)
  UIC   =       $(SYSCONF_UIC)
@@ -64,11 +55,10 @@
  
  moc: $(SRCMOC)
  
-@@ -13114,4 +13110,43 @@ opengl/qgl_x11.o: opengl/qgl_x11.cpp \
-               tools/qgdict.h \
+@@ -13115,3 +13111,42 @@ opengl/qgl_x11.o: opengl/qgl_x11.cpp \
                kernel/qtranslator.h \
                tools/qintdict.h
-+
+ 
 +# problem files  -- compile with no optimization
 +ifeq (${MACHINE_ARCH},alpha)
 +
@@ -107,4 +97,4 @@
 +table/moc_qtable.o: table/moc_qtable.cc
 +
 +endif
- 
++

-- 
Best regards, Aleksey Cheusov.

References:
- patches for pkgsrc (yacc and lex tools)
  - From: Aleksey Cheusov
- Re: patches for pkgsrc (yacc and lex tools)
  - From: Roland Illig

Prev by Date: Re: patches for pkgsrc (yacc and lex tools)
Next by Date: Need a fix for xfixes...
Previous by Thread: Re: patches for pkgsrc (yacc and lex tools)
Next by Thread: Re: patches for pkgsrc (yacc and lex tools)
Indexes:

Home | Main Index | Thread Index | Old Index