Date: Sun, 26 Aug 2001 13:11:55 +0200 (CEST) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/30098: Update port: graphics/hppsmtools Message-ID: <20010826111155.6C5603C83@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 30098 >Category: ports >Synopsis: Update port: graphics/hppsmtools >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Aug 26 04:20:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 4.3-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: <Relevant environment information (multiple lines)> >Description: Fixup this port: - Install the psm* commands correctly, they used to be the same binary but aren't with the current version. Sigh. - Install docs only if NOPORTDOCS is not set. - Fix some warnings, remove -pedantic and -Wall to silence the rest. - Bump PORTREVISION, as psmdel/psmsho/psmdir now works. This adds the following files: files/patch-psmdir.c files/patch-psmdel.c files/patch-exif.h >How-To-Repeat: <Code/input/activities to reproduce the problem (multiple lines)> >Fix: diff -Nur hppsmtools.old/Makefile hppsmtools/Makefile --- hppsmtools.old/Makefile Sat May 26 03:43:26 2001 +++ hppsmtools/Makefile Sun Aug 26 13:08:51 2001 @@ -7,6 +7,7 @@ PORTNAME= hppsmtools PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://unimut.fsk.uni-heidelberg.de/demi/photosmart/ \ http://www.freenix.no/~anders/ \ @@ -17,13 +18,13 @@ ALL_TARGET= do-install: - @${RM} -f ${PREFIX}/bin/psmget ${PREFIX}/bin/psmdir - @${RM} -f ${PREFIX}/bin/psmdel ${PREFIX}/bin/psmsho @${INSTALL_PROGRAM} ${WRKSRC}/psmget ${PREFIX}/bin/ - @${LN} ${PREFIX}/bin/psmget ${PREFIX}/bin/psmdir - @${LN} ${PREFIX}/bin/psmget ${PREFIX}/bin/psmdel - @${LN} ${PREFIX}/bin/psmget ${PREFIX}/bin/psmsho + @${INSTALL_PROGRAM} ${WRKSRC}/psmdir ${PREFIX}/bin/ + @${INSTALL_PROGRAM} ${WRKSRC}/psmdel ${PREFIX}/bin/ + @${INSTALL_PROGRAM} ${WRKSRC}/psmsho ${PREFIX}/bin/ +.if !defined(NOPORTDOCS) @${INSTALL} -d -m 0755 ${PREFIX}/share/doc/hppsmtools @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/hppsmtools/ +.endif .include <bsd.port.mk> diff -Nur hppsmtools.old/files/patch-aa hppsmtools/files/patch-aa --- hppsmtools.old/files/patch-aa Tue Mar 21 01:25:33 2000 +++ hppsmtools/files/patch-aa Sun Aug 26 12:33:44 2001 @@ -1,12 +1,12 @@ ---- Makefile.orig Wed Mar 1 09:23:12 2000 -+++ Makefile Mon Mar 20 19:23:54 2000 +--- 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) -Wall -pedantic $(CFLAGS) ++COPTS=$(ADDIT_DEFS) $(CFLAGS) FILES= psm.h psm.c \ exif.h exifparse.c \ diff -Nur hppsmtools.old/files/patch-exif.h hppsmtools/files/patch-exif.h --- hppsmtools.old/files/patch-exif.h Thu Jan 1 01:00:00 1970 +++ hppsmtools/files/patch-exif.h Sun Aug 26 12:32:55 2001 @@ -0,0 +1,11 @@ +--- 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 -Nur hppsmtools.old/files/patch-psmdel.c hppsmtools/files/patch-psmdel.c --- hppsmtools.old/files/patch-psmdel.c Thu Jan 1 01:00:00 1970 +++ hppsmtools/files/patch-psmdel.c Sun Aug 26 12:30:30 2001 @@ -0,0 +1,10 @@ +--- 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 -Nur hppsmtools.old/files/patch-psmdir.c hppsmtools/files/patch-psmdir.c --- hppsmtools.old/files/patch-psmdir.c Thu Jan 1 01:00:00 1970 +++ hppsmtools/files/patch-psmdir.c Sun Aug 26 12:29:55 2001 @@ -0,0 +1,10 @@ +--- 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 -Nur hppsmtools.old/pkg-plist hppsmtools/pkg-plist --- hppsmtools.old/pkg-plist Thu Oct 7 05:26:00 1999 +++ hppsmtools/pkg-plist Sun Aug 26 12:24:46 2001 @@ -2,5 +2,5 @@ bin/psmdir bin/psmdel bin/psmsho -share/doc/hppsmtools/README -@dirrm share/doc/hppsmtools +%%PORTDOCS%%share/doc/hppsmtools/README +%%PORTDOCS%%@dirrm share/doc/hppsmtools >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010826111155.6C5603C83>