Date: Sun, 30 Jan 2000 20:30:11 +0100 (CET) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16479: Update port: graphics/hppsmtools Message-ID: <20000130193011.0BFA05790@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 16479 >Category: ports >Synopsis: Update port: graphics/hppsmtools >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jan 30 11:40:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 3.4-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: FreeBSD eggsilo.bsdonline.org 3.4-STABLE FreeBSD 3.4-STABLE #2: Tue Jan 18 21:35:10 CET 2000 root@eggsilo.bsdonline.org:/usr/src/sys/compile/EGGSILO i386 >Description: Updates the port to the latest version: 0.92. >How-To-Repeat: >Fix: diff -Nur hppsmtools.old/Makefile hppsmtools/Makefile --- hppsmtools.old/Makefile Thu Oct 7 05:25:59 1999 +++ hppsmtools/Makefile Sun Jan 30 17:21:27 2000 @@ -6,7 +6,7 @@ # $FreeBSD: ports/graphics/hppsmtools/Makefile,v 1.1.1.1 1999/10/07 03:25:59 cpiazza Exp $ # -DISTNAME= hppsmtools-0.3 +DISTNAME= hppsmtools-0.92 CATEGORIES= graphics MASTER_SITES= http://unimut.fsk.uni-heidelberg.de/unimut/photosmart/ \ http://www.freenix.no/~anders/ \ diff -Nur hppsmtools.old/files/md5 hppsmtools/files/md5 --- hppsmtools.old/files/md5 Thu Oct 7 05:26:00 1999 +++ hppsmtools/files/md5 Sun Jan 30 17:21:46 2000 @@ -1 +1 @@ -MD5 (hppsmtools-0.3.tar.gz) = 55a5a81016c7f8f1f257dd34322d6936 +MD5 (hppsmtools-0.92.tar.gz) = 2e24ddfd036ee02ca8cfbcde39526f41 diff -Nur hppsmtools.old/patches/patch-aa hppsmtools/patches/patch-aa --- hppsmtools.old/patches/patch-aa Thu Oct 7 05:26:00 1999 +++ hppsmtools/patches/patch-aa Sun Jan 30 17:25:10 2000 @@ -1,16 +1,28 @@ -*** psmget.c.orig Wed Sep 1 23:04:53 1999 ---- psmget.c Wed Sep 1 23:06:41 1999 -*************** -*** 13,23 **** - #include <sys/poll.h> - #include <sys/ioctl.h> - -- #ifdef PSM_GLIBC - #include <errno.h> -- #include <termbits.h> - #include <termios.h> -- #endif - - typedef unsigned char uchar; - ---- 13,20 ---- +--- Makefile.orig Sun Jan 30 17:23:28 2000 ++++ Makefile Sun Jan 30 17:24:52 2000 +@@ -7,21 +7,20 @@ + + + COPTS=-g $(ADDIT_DEFS) -Wall +-CC=gcc $(COPTS) + + .c.o: +- $(CC) -c $< ++ $(CC) $(COPTS) -c $< + + DESTDIR=hppsmtools-$(PSM_VERSION) + + psmget: psmget.o +- $(CC) psmget.o -o psmget ++ $(CC) $(COPTS) psmget.o -o psmget + + psmget.o: psmget.c psmget.h +- $(CC) -c psmget.c -DPSM_VERSION=\"$(PSM_VERSION)\" ++ $(CC) $(COPTS) -c psmget.c -DPSM_VERSION=\"$(PSM_VERSION)\" + + crcguess: crcguess.o crc32.o +- gcc crcguess.o crc32.o -o crcguess ++ $(CC) crcguess.o crc32.o -o crcguess + + distri: + -mkdir $(DESTDIR) diff -Nur hppsmtools.old/patches/patch-ab hppsmtools/patches/patch-ab --- hppsmtools.old/patches/patch-ab Thu Oct 7 05:26:00 1999 +++ hppsmtools/patches/patch-ab Sun Jan 30 17:25:47 2000 @@ -1,24 +1,13 @@ ---- Makefile.orig Wed Oct 6 20:21:39 1999 -+++ Makefile Wed Oct 6 20:22:03 1999 -@@ -4,18 +4,18 @@ - #ADDIT_DEFS=-DPSM_GLIBC +--- psmget.c.orig Sun Jan 30 17:23:34 2000 ++++ psmget.c Sun Jan 30 17:25:33 2000 +@@ -42,10 +42,8 @@ + #include <signal.h> + #include "psmget.h" - .c.o: -- gcc -g $(ADDIT_DEFS) -Wall -c $< -+ ${CC} ${CFLAGS} $(ADDIT_DEFS) -Wall -c $< +-#ifdef PSM_GLIBC + #include <errno.h> + #include <termios.h> +-#endif - VERSION=0.3 - DESTDIR=hppsmtools-$(VERSION) - - psmget: psmget.o - @echo "If this doesn't compile, try uncommenting ADDIT_DEFS in the Makefile" -- gcc psmget.o -o psmget -+ ${CC} psmget.o -o psmget - @echo "Please *do* read the README, in particular on how to get psmdir & Co." - - crcguess: crcguess.o crc32.o -- gcc crcguess.o crc32.o -o crcguess -+ ${CC} crcguess.o crc32.o -o crcguess - - distri: - -mkdir $(DESTDIR) + int _camgetc_cache = -1; + int byte_count = 0; >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?20000130193011.0BFA05790>