From b9dd9207ecc26ae8ea4e0170ba56e5d49823121c Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Thu, 22 Apr 2004 12:53:41 +0000
Subject: [PATCH] cleanup; okay sturm@.

---
 graphics/giftrans/Makefile          | 23 ++++++++++++++---------
 graphics/giftrans/patches/patch-aa  | 11 -----------
 graphics/giftrans/scripts/configure |  4 ----
 3 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 graphics/giftrans/patches/patch-aa
 delete mode 100644 graphics/giftrans/scripts/configure

diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index fb0ea1e9146..8a1103046ca 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -1,25 +1,30 @@
-# $OpenBSD: Makefile,v 1.12 2003/07/28 21:03:01 jolan Exp $
-# $FreeBSD: Makefile,v 1.2 1996/11/18 11:27:58 asami Exp $
+# $OpenBSD: Makefile,v 1.13 2004/04/22 12:53:41 xsa Exp $
 
 COMMENT=	"handle GIF89a transparent option and interlace mode"
 
 DISTNAME=	giftrans
 PKGNAME=        giftrans-1.12
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://ftp.lab.kdd.co.jp/infosystems/misc/tools/
 
-PERMIT_PACKAGE_CDROM=	"no fee"
+# BSD-like, badly worded
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	"no fee"
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/infosystems/misc/tools/
+
+USE_X11=	Yes
+NO_REGRESS=	Yes
+
+do-configure:
+	@perl -pi -e 's,/usr/lib,${X11BASE}/lib,g' ${WRKSRC}/giftrans.c
+
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} giftrans.c -o giftrans
 
-NO_REGRESS=	Yes
-
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/giftrans/patches/patch-aa b/graphics/giftrans/patches/patch-aa
deleted file mode 100644
index 65752726593..00000000000
--- a/graphics/giftrans/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- giftrans.c.orig	Fri Feb 17 03:13:25 1995
-+++ giftrans.c	Mon Oct 28 05:59:24 1996
-@@ -150,7 +150,7 @@
- 
- #ifndef RGBTXT
- #ifdef X11
--#define	RGBTXT	"/usr/lib/X11/rgb.txt"
-+#define	RGBTXT	"%%X11BASE%%/lib/X11/rgb.txt"
- #else /* X11 */
- #ifdef OPENWIN
- #define	RGBTXT	"/usr/openwin/lib/rgb.txt"
diff --git a/graphics/giftrans/scripts/configure b/graphics/giftrans/scripts/configure
deleted file mode 100644
index 5833383d544..00000000000
--- a/graphics/giftrans/scripts/configure
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-
-perl -pi -e 's|%%X11BASE%%|$ENV{'X11BASE'}|g' $WRKSRC/giftrans.c