summaryrefslogtreecommitdiff
path: root/www/swiggle
diff options
context:
space:
mode:
authorsnj <snj>2004-04-28 06:00:11 +0000
committersnj <snj>2004-04-28 06:00:11 +0000
commit9016bc7b805bc3846704ee2ce748fc34838db224 (patch)
tree7ea7ffc443361fd233661b210b09aee888570b4b /www/swiggle
parent07733667e54c1257a89ac3fede040142baffb5aa (diff)
downloadpkgsrc-9016bc7b805bc3846704ee2ce748fc34838db224.tar.gz
Avoid using a patch that needs -ko. Requested by agc@.
Diffstat (limited to 'www/swiggle')
-rw-r--r--www/swiggle/Makefile10
-rw-r--r--www/swiggle/distinfo3
-rw-r--r--www/swiggle/patches/patch-aa33
3 files changed, 10 insertions, 36 deletions
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index dd51dfd2068..59aa2a6d30f 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -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 @@ COMMENT= Lightweight image gallery generator
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 --git a/www/swiggle/distinfo b/www/swiggle/distinfo
index 9c1a0ac580c..5e7b9a606bd 100644
--- a/www/swiggle/distinfo
+++ b/www/swiggle/distinfo
@@ -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 --git a/www/swiggle/patches/patch-aa b/www/swiggle/patches/patch-aa
deleted file mode 100644
index d1aaf2a3483..00000000000
--- a/www/swiggle/patches/patch-aa
+++ /dev/null
@@ -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}