diff options
author | adam <adam> | 2004-03-30 09:00:41 +0000 |
---|---|---|
committer | adam <adam> | 2004-03-30 09:00:41 +0000 |
commit | 9ed98809f2a7783afbbac8b8ce67d58aeb1e0db3 (patch) | |
tree | 076174fead3d709c2c3ca53459c870191a4140c0 | |
parent | 8132c9b839e4db857888a3efbed8b084fda4594e (diff) | |
download | pkgsrc-9ed98809f2a7783afbbac8b8ce67d58aeb1e0db3.tar.gz |
Now uses buldlink3; does not force -O optimisation any more
-rw-r--r-- | games/scummvm/Makefile | 12 | ||||
-rw-r--r-- | games/scummvm/distinfo | 3 | ||||
-rw-r--r-- | games/scummvm/patches/patch-aa | 15 |
3 files changed, 23 insertions, 7 deletions
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index 5a687862423..35832b1b049 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/29 01:09:56 dillo Exp $ +# $NetBSD: Makefile,v 1.21 2004/03/30 09:00:41 adam Exp $ DISTNAME= scummvm-0.6.0 CATEGORIES= games @@ -11,7 +11,7 @@ COMMENT= LucasArts Script Creation Utility for Maniac Mansion DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_X11= yes HAS_CONFIGURE= yes @@ -24,8 +24,8 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/scummvm.xpm ${PREFIX}/share/pixmaps -.include "../../audio/libmad/buildlink2.mk" -.include "../../audio/libvorbis/buildlink2.mk" -.include "../../devel/SDL/buildlink2.mk" -.include "../../graphics/libmpeg2/buildlink2.mk" +.include "../../audio/libmad/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../devel/SDL/buildlink3.mk" +.include "../../graphics/libmpeg2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo index 1fbd4d40a27..eeb2081d245 100644 --- a/games/scummvm/distinfo +++ b/games/scummvm/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2004/03/29 01:09:56 dillo Exp $ +$NetBSD: distinfo,v 1.13 2004/03/30 09:00:41 adam Exp $ SHA1 (scummvm-0.6.0.tar.bz2) = ff273d23a9cf75a14ffb4d859e6d9e22a6b44548 Size (scummvm-0.6.0.tar.bz2) = 1631951 bytes +SHA1 (patch-aa) = 776a69adeb8dfb7b8cf6e9cf6d7b25887a657f14 SHA1 (patch-ab) = 8e694dab27d76d3df00be07f510094b1e326ca6c diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa new file mode 100644 index 00000000000..93480015c5d --- /dev/null +++ b/games/scummvm/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.11 2004/03/30 09:04:05 adam Exp $ + +--- Makefile.orig 2004-03-05 10:53:44.000000000 +0000 ++++ Makefile +@@ -2,3 +2,3 @@ + +-CXX := c++ ++#CXX := c++ + AR := ar cru +@@ -34,4 +34,3 @@ include config.mak + +-CXXFLAGS:= -Wall $(CXXFLAGS) +-CXXFLAGS+= -O -Wuninitialized ++CXXFLAGS+= -Wall -Wuninitialized + CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas |