>Number:         22358
>Category:       pkg
>Synopsis:       distinfo for scummvm patches is wrong
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 04 19:32:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jon Olsson
>Release:        NetBSD 1.6U
>Organization:
Monkey Mafia
>Environment:
-current
>Description:
the SHA1 sum of the patches supplied in the pkgsrc entry for
scummvm is erroneous:

apa scummvm% cvs -qd anoncvs@anoncvs.netbsd.org:/cvsroot up -Pd
apa scummvm% make install                                      
===> Checking for vulnerabilities in scummvm-0.5.0
=> Checksum OK for scummvm-0.5.0.tar.bz2.
===> Extracting for scummvm-0.5.0
===> Required installed package SDL>=1.2.5nb5: SDL-1.2.5nb6 found
===> Required installed package glut>=3.4.2: glut-3.4.2 found
===> Required installed package aalib-x11>=1.4.0.4nb1: aalib-x11-1.4.0.4nb2 found
===> Required installed package libmad>=0.15.0b: libmad-0.15.0b found
===> Required installed package gmake>=3.78: gmake-3.80nb2 found
===> Required installed package x11-links>=0.12: x11-links-0.12 found
===> Patching for scummvm-0.5.0
===> Applying pkgsrc patches for scummvm-0.5.0
**************************************
Patch file /usr/pkgsrc/games/scummvm/patches/patch-aa has been modified
**************************************
Patching failed due to modified patch file(s):  patch-aa
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/games/scummvm
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/games/scummvm
apa scummvm% grep SHA1 distinfo                                
SHA1 (scummvm-0.5.0.tar.bz2) = 4b66152b04a2abdf5f12dac48fe6ddd7585caa35
SHA1 (patch-aa) = 515a543a2e3e806a9328f8cced67378a7b445b4d
SHA1 (patch-ab) = 86c74b6d31695a02d05dacf6161da0f3c09b42cf
apa scummvm% sha1 patches/patch-a{a,b}
SHA1 (patches/patch-aa) = 0bc7cfdc6506a3ff7693e551429d03ccf9f82052
SHA1 (patches/patch-ab) = c955a313f22f60706168104f4960cfbb98e7aa3f
apa scummvm% cat patches/patch-a{a,b}
$NetBSD: patch-aa,v 1.6 2003/08/04 08:21:05 adam Exp $

--- Makefile.orig       2003-08-04 09:47:54.000000000 +0200
+++ Makefile    2003-08-04 09:49:16.000000000 +0200
@@ -1,6 +1,6 @@
 # $Header: /cvsroot/pkgsrc/games/scummvm/patches/patch-aa,v 1.6 2003/08/04 08:21:05 adam Exp $
 
-CXX     := c++
+#CXX     := c++
 AR      := ar cru
 RANLIB  := ranlib
 RM      := rm -f
@@ -17,7 +17,7 @@
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################
 
-CXXFLAGS:= -g -O
+CXXFLAGS+=${CFLAGS}
 DEFINES :=
 LDFLAGS :=
 INCLUDES:= -I. -Icommon
$NetBSD: patch-ab,v 1.2 2003/08/04 08:21:05 adam Exp $

--- common.rules.orig   2003-07-20 03:01:47.000000000 +0200
+++ common.rules        2003-08-04 09:47:58.000000000 +0200
@@ -1,5 +1,7 @@
 # Common build rules, used by the sub modules and their module.mk files
 
+CPPFLAGS+=     -I$(BUILDLINK_DIR)/include
+
 # Convenience library target
 $(MODULE)/lib$(MODULE).a: $(MODULE_OBJS)
        -$(RM) $@


>How-To-Repeat:
try to build scummvm from a -current pkgsrc.
>Fix:
update the SHA1 sums to the ones above.
>Release-Note:
>Audit-Trail:
>Unformatted: