Attachment #52992 for bug #80205

View | Details | Raw Unified | Return to bug 80205
Collapse All | Expand All




#

PORTNAME=	hppsmtools
PORTVERSION=	1.1
CATEGORIES=	graphics
MASTER_SITES=	http://unimut.fsk.uni-heidelberg.de/demi/photosmart/

MAINTAINER=	ports@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

Lines 1-2 Link Here

(-)graphics/hppsmtools/distinfo (-2 / +2 lines)
1	MD5 (hppsmtools-1.02.tar.gz) = b6d49af2321a06ff8cb0821c5deac3fc	1	MD5 (hppsmtools-1.1.tar.gz) = e3b490ff97ce4f5bd9a3974193b926bb
2	SIZE (hppsmtools-1.02.tar.gz) = 25887	2	SIZE (hppsmtools-1.1.tar.gz) = 27048




--- 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 \

Lines 1-11 Link Here

(-)graphics/hppsmtools/files/patch-exif.h (-11 lines)
1	--- exif.h.orig Sun Aug 26 12:32:35 2001
2	+++ exif.h Sun Aug 26 12:32:44 2001
3	@@ -94,8 +94,6 @@
4
5	#define EXIF_INVALID_RATIONAL 1e40
6
7	-typedef unsigned char uint8_t;
8	-
9	/* The next two types are actually private */
10	typedef struct
11	{ int16_t tag;

Lines 1-10 Link Here

(-)graphics/hppsmtools/files/patch-psmdel.c (-10 lines)
1	--- psmdel.c.orig Sun Aug 26 12:29:07 2001
2	+++ psmdel.c Sun Aug 26 12:29:11 2001
3	@@ -3,7 +3,6 @@
4	#include <unistd.h>
5	#include <signal.h>
6	#include <string.h>
7	-#include <malloc.h>
8	#include "psm.h"
9	#include "config.h"
10

Lines 1-10 Link Here

(-)graphics/hppsmtools/files/patch-psmdir.c (-10 lines)
1	--- psmdir.c.orig Sun Aug 26 12:29:38 2001
2	+++ psmdir.c Sun Aug 26 12:29:44 2001
3	@@ -3,7 +3,6 @@
4	#include <unistd.h>
5	#include <signal.h>
6	#include <string.h>
7	-#include <malloc.h>
8	#include <math.h>
9	#include "psm.h"
10	#include "config.h"

Lines 1-6 Link Here

(-)graphics/hppsmtools/pkg-plist (-6 lines)
1	bin/psmdel
2	bin/psmdir
3	bin/psmget
4	bin/psmsho
5	%%PORTDOCS%%share/doc/hppsmtools/README
6	%%PORTDOCS%%@dirrm share/doc/hppsmtools

Return to bug 80205

Lines 6-17 Link Here

(-)graphics/hppsmtools/Makefile (-1 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= hppsmtools	8	PORTNAME= hppsmtools
9	PORTVERSION= 1.02	9	PORTVERSION= 1.1
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://unimut.fsk.uni-heidelberg.de/demi/photosmart/	11	MASTER_SITES= http://unimut.fsk.uni-heidelberg.de/demi/photosmart/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Tool for HP PhotoSmart C5340A & Konica Q-EZ digital cameras	14	COMMENT= Tool for HP PhotoSmart C5340A & Konica Q-EZ digital cameras
		15
		16	USE_REINPLACE= yes
		17
		18	PORTDOCS= README
		19	PLIST_FILES= bin/psmdel bin/psmdir bin/psmget bin/psmsho
		20
		21	post-patch:
		22	@${REINPLACE_CMD} -e 's\|^CC=\|#CC=\|g ; \
		23	s\|-Wall -pedantic\|$$(CFLAGS)\|g' ${WRKSRC}/Makefile
		24	@${REINPLACE_CMD} -e '/typedef unsigned char/d' ${WRKSRC}/exif.h
		25	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/psm*.c
15		26
16	do-install:	27	do-install:
17	.for file in psmdel psmdir psmget psmsho	28	.for file in psmdel psmdir psmget psmsho

Lines 1-12 Link Here

(-)graphics/hppsmtools/files/patch-aa (-12 lines)
1	--- Makefile.orig Wed Mar 1 15:23:12 2000
2	+++ Makefile Sun Aug 26 12:33:29 2001
3	@@ -6,8 +6,7 @@
4	# Set this to your liking
5	PREFIX=/usr/local
6
7	-COPTS=$(ADDIT_DEFS) -Wall -pedantic
8	-CC=gcc
9	+COPTS=$(ADDIT_DEFS) $(CFLAGS)
10
11	FILES= psm.h psm.c \
12	exif.h exifparse.c \