ports/80205: Update port: graphics/hppsmtools to 1.1

[KATO Tsuguru]

>Number:         80205
>Category:       ports
>Synopsis:       Update port: graphics/hppsmtools to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 21 14:10:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1

Remove file:
files/patch-aa
files/patch-exif.h
files/patch-psdel.c
files/patch-psdir.c
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/hppsmtools/Makefile graphics/hppsmtools/Makefile
--- /usr/ports/graphics/hppsmtools/Makefile	Sat Apr 12 22:48:44 2003
+++ graphics/hppsmtools/Makefile	Thu Apr 21 01:18:43 2005
@@ -6,12 +6,23 @@
 #
 
 PORTNAME=	hppsmtools
-PORTVERSION=	1.02
+PORTVERSION=	1.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://unimut.fsk.uni-heidelberg.de/demi/photosmart/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Tool for HP PhotoSmart C5340A & Konica Q-EZ digital cameras
+
+USE_REINPLACE=	yes
+
+PORTDOCS=	README
+PLIST_FILES=	bin/psmdel bin/psmdir bin/psmget bin/psmsho
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CC=|#CC=|g ; \
+		 s|-Wall -pedantic|$$(CFLAGS)|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/typedef unsigned char/d' ${WRKSRC}/exif.h
+	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/psm*.c
 
 do-install:
 .for file in psmdel psmdir psmget psmsho
diff -urN /usr/ports/graphics/hppsmtools/distinfo graphics/hppsmtools/distinfo
--- /usr/ports/graphics/hppsmtools/distinfo	Thu Jan 29 20:26:24 2004
+++ graphics/hppsmtools/distinfo	Thu Apr 21 01:06:54 2005
@@ -1,2 +1,2 @@
-MD5 (hppsmtools-1.02.tar.gz) = b6d49af2321a06ff8cb0821c5deac3fc
-SIZE (hppsmtools-1.02.tar.gz) = 25887
+MD5 (hppsmtools-1.1.tar.gz) = e3b490ff97ce4f5bd9a3974193b926bb
+SIZE (hppsmtools-1.1.tar.gz) = 27048
diff -urN /usr/ports/graphics/hppsmtools/files/patch-aa graphics/hppsmtools/files/patch-aa
--- /usr/ports/graphics/hppsmtools/files/patch-aa	Tue Aug 28 00:26:07 2001
+++ graphics/hppsmtools/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
---- Makefile.orig	Wed Mar  1 15:23:12 2000
-+++ Makefile	Sun Aug 26 12:33:29 2001
-@@ -6,8 +6,7 @@
- # Set this to your liking
- PREFIX=/usr/local
- 
--COPTS=$(ADDIT_DEFS) -Wall -pedantic
--CC=gcc
-+COPTS=$(ADDIT_DEFS) $(CFLAGS)
- 
- FILES=	psm.h psm.c \
- 	exif.h exifparse.c \
diff -urN /usr/ports/graphics/hppsmtools/files/patch-exif.h graphics/hppsmtools/files/patch-exif.h
--- /usr/ports/graphics/hppsmtools/files/patch-exif.h	Tue Aug 28 00:26:07 2001
+++ graphics/hppsmtools/files/patch-exif.h	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- exif.h.orig	Sun Aug 26 12:32:35 2001
-+++ exif.h	Sun Aug 26 12:32:44 2001
-@@ -94,8 +94,6 @@
- 
- #define EXIF_INVALID_RATIONAL 1e40
- 
--typedef unsigned char uint8_t;
--
- /* The next two types are actually private */
- typedef struct
- {	int16_t tag;
diff -urN /usr/ports/graphics/hppsmtools/files/patch-psmdel.c graphics/hppsmtools/files/patch-psmdel.c
--- /usr/ports/graphics/hppsmtools/files/patch-psmdel.c	Tue Aug 28 00:26:07 2001
+++ graphics/hppsmtools/files/patch-psmdel.c	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- psmdel.c.orig	Sun Aug 26 12:29:07 2001
-+++ psmdel.c	Sun Aug 26 12:29:11 2001
-@@ -3,7 +3,6 @@
- #include <unistd.h>
- #include <signal.h>
- #include <string.h>
--#include <malloc.h>
- #include "psm.h"
- #include "config.h"
- 
diff -urN /usr/ports/graphics/hppsmtools/files/patch-psmdir.c graphics/hppsmtools/files/patch-psmdir.c
--- /usr/ports/graphics/hppsmtools/files/patch-psmdir.c	Tue Aug 28 00:26:07 2001
+++ graphics/hppsmtools/files/patch-psmdir.c	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- psmdir.c.orig	Sun Aug 26 12:29:38 2001
-+++ psmdir.c	Sun Aug 26 12:29:44 2001
-@@ -3,7 +3,6 @@
- #include <unistd.h>
- #include <signal.h>
- #include <string.h>
--#include <malloc.h>
- #include <math.h>
- #include "psm.h"
- #include "config.h"
diff -urN /usr/ports/graphics/hppsmtools/pkg-plist graphics/hppsmtools/pkg-plist
--- /usr/ports/graphics/hppsmtools/pkg-plist	Wed Nov 20 23:45:42 2002
+++ graphics/hppsmtools/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,6 +0,0 @@
-bin/psmdel
-bin/psmdir
-bin/psmget
-bin/psmsho
-%%PORTDOCS%%share/doc/hppsmtools/README
-%%PORTDOCS%%@dirrm share/doc/hppsmtools
>Release-Note:
>Audit-Trail:
>Unformatted: