From c452e3f6ae329374a9cf771af93051da5c273519 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 23 Aug 2001 19:45:42 +0000
Subject: Substitute ${PREFIX} for /usr/local, not /usr/pkg.  Also use
 GTK_CONFIG instead of directly specifying the path to gtk-config.

---
 graphics/gfract/Makefile         | 12 +++++++++++-
 graphics/gfract/distinfo         |  5 ++---
 graphics/gfract/patches/patch-aa |  6 +++---
 graphics/gfract/patches/patch-ab | 13 -------------
 4 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 graphics/gfract/patches/patch-ab

(limited to 'graphics')

diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 5cd1ad01343..c378a4288a0 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/12 22:07:50 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/23 19:45:42 jlam Exp $
 #
 
 DISTNAME=	gfract-0.21
@@ -17,6 +17,16 @@ ALL_TARGET=	gfract
 
 post-extract:
 	${MV} ${WRKDIR}/monk2\'.map ${WRKDIR}/monk2.map
+	files="main.c";							\
+	cd ${WRKSRC}; for file in $${files}; do				\
+		${MV} $${file} $${file}.fixme;				\
+		${SED} -e "s|/usr/local/|${PREFIX}/|g"			\
+			$${file}.fixme > $${file};			\
+		if [ -x $${file}.fixme ]; then				\
+			${CHMOD} +x $${file};				\
+		fi;							\
+		${RM} $${file}.fixme;					\
+	done
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gfract
diff --git a/graphics/gfract/distinfo b/graphics/gfract/distinfo
index 9bdea8077a0..6682fb2622b 100644
--- a/graphics/gfract/distinfo
+++ b/graphics/gfract/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/12 22:07:50 zuntum Exp $
+$NetBSD: distinfo,v 1.2 2001/08/23 19:45:42 jlam Exp $
 
 SHA1 (gfract-0.21.tar.gz) = 0d996547359ba5f52e43fdb2b4c4baf2a4773a88
 Size (gfract-0.21.tar.gz) = 27927 bytes
 SHA1 (gfract-palettes-0.1.tar.gz) = f05e06e6012e1b1526e0c796ca7f6617fca8ab7d
 Size (gfract-palettes-0.1.tar.gz) = 223648 bytes
-SHA1 (patch-aa) = bc03fea85fdb9978c0738ee097e52c1ba8b7b9d4
-SHA1 (patch-ab) = 529cdf7658dc8863552f26d9f24b95a5cb6155de
+SHA1 (patch-aa) = 1a5edf6a5c0f1d638aba617f316b3f8d20e19a0a
diff --git a/graphics/gfract/patches/patch-aa b/graphics/gfract/patches/patch-aa
index a042452969e..75d0ef96650 100644
--- a/graphics/gfract/patches/patch-aa
+++ b/graphics/gfract/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:07:50 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/23 19:45:43 jlam Exp $
 
 --- Makefile.orig	Fri Feb  9 01:25:57 2001
 +++ Makefile
@@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/12 22:07:50 zuntum Exp $
  #CFLAGS=-g -Wall
 -CFLAGS=-O2 -Wall -Winline
 -LIBS=-lpng -lz
-+CFLAGS+=`${BUILDLINK_DIR}/bin/gtk-config --cflags`
-+LIBS+=`${BUILDLINK_DIR}/bin/gtk-config --libs` -lpng -lz
++CFLAGS+=`${GTK_CONFIG} --cflags`
++LIBS+=`${GTK_CONFIG} --libs` -lpng -lz
  
  OBJS=main.o fractal.o palette.o globals.o misc.o attr_dlg.o my_png.o \
  pal_rot_dlg.o timer.o
diff --git a/graphics/gfract/patches/patch-ab b/graphics/gfract/patches/patch-ab
deleted file mode 100644
index d835ac465cd..00000000000
--- a/graphics/gfract/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/12 22:07:50 zuntum Exp $
-
---- main.c.orig	Fri Feb  9 01:25:57 2001
-+++ main.c
-@@ -40,7 +40,7 @@
- 
- 
- #define DUMP_COMMAND "--read-dump-from"
--#define DEFAULT_PALETTE_FILE "/usr/local/share/gfract/palettes/blues.map"
-+#define DEFAULT_PALETTE_FILE "/usr/pkg/share/gfract/palettes/blues.map"
- 
- /* why the fuck does gtk have to define these in its header files?
-    the glib/gdk/gtk combo is forgetting seriously that it's just a Yet
-- 
cgit v1.2.3