[pkgsrc/trunk]: pkgsrc/www/swiggle Avoid using a patch that needs -ko. Reque...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a844f41235fd
branches:  trunk
changeset: 474386:a844f41235fd
user:      snj <snj%pkgsrc.org@localhost>
date:      Wed Apr 28 06:00:11 2004 +0000

description:
Avoid using a patch that needs -ko.  Requested by agc@.

diffstat:

 www/swiggle/Makefile         |  10 +++++++++-
 www/swiggle/distinfo         |   3 +--
 www/swiggle/patches/patch-aa |  33 ---------------------------------
 3 files changed, 10 insertions(+), 36 deletions(-)

diffs (71 lines):

diff -r 7c66d21420e9 -r a844f41235fd www/swiggle/Makefile
--- a/www/swiggle/Makefile      Wed Apr 28 05:33:58 2004 +0000
+++ b/www/swiggle/Makefile      Wed Apr 28 06:00:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/26 03:27:30 snj Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/28 06:00:11 snj Exp $
 
 DISTNAME=      swiggle-0.3.2
 CATEGORIES=    www graphics
@@ -10,6 +10,14 @@
 
 USE_BUILDLINK3=        yes
 
+SUBST_CLASSES+=                mf
+SUBST_STAGE.mf=                post-patch
+SUBST_FILES.mf=                Makefile
+SUBST_SED.mf=          -e "s/gcc/${CC}/" -e "s/-O3//"
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/swiggle ${PREFIX}/bin/
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 
diff -r 7c66d21420e9 -r a844f41235fd www/swiggle/distinfo
--- a/www/swiggle/distinfo      Wed Apr 28 05:33:58 2004 +0000
+++ b/www/swiggle/distinfo      Wed Apr 28 06:00:11 2004 +0000
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/26 03:27:30 snj Exp $
+$NetBSD: distinfo,v 1.2 2004/04/28 06:00:11 snj Exp $
 
 SHA1 (swiggle-0.3.2.tar.gz) = ef798b9d35dac021a6bc9a12095109a96e35e2d1
 Size (swiggle-0.3.2.tar.gz) = 13995 bytes
-SHA1 (patch-aa) = 4dc375e7da9733c10f83e0afbe483383da8712f8
diff -r 7c66d21420e9 -r a844f41235fd www/swiggle/patches/patch-aa
--- a/www/swiggle/patches/patch-aa      Wed Apr 28 05:33:58 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/04/26 03:29:22 snj Exp $
-
---- Makefile.orig      2004-04-21 17:57:27.000000000 -0700
-+++ Makefile   2004-04-21 17:58:41.000000000 -0700
-@@ -1,12 +1,10 @@
- # Makefile for swiggle
- #
- # $Id: patch-aa,v 1.1 2004/04/26 03:29:22 snj Exp $
--CC = gcc
- PROGRAM = swiggle
- OBJS = swiggle.o resize.o html.o
- HEADER = swiggle.h
--CFLAGS += -Wall -g -I/usr/local/include -I/usr/local/include/libexif -O3
--LDFLAGS += -L/usr/local/lib -ljpeg -lexif
-+LDFLAGS += -ljpeg -lexif
- 
- .if defined(DEBUG)
- CFLAGS += -DDEBUG
-@@ -15,12 +13,12 @@ CFLAGS += -DDEBUG
- all: ${PROGRAM}
- 
- ${PROGRAM}: ${OBJS}
--      gcc ${CFLAGS} ${LDFLAGS} -o ${PROGRAM} ${OBJS}
-+      ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o ${PROGRAM} ${OBJS}
- 
- ${OBJS}: ${HEADER}
- 
- install:
--      install -c -o 0 -g 0 -s swiggle /usr/local/bin
-+      ${BSD_INSTALL_PROGRAM} swiggle ${PREFIX}/bin/
- 
- clean:
-       rm -f *.o *.core ${PROGRAM}