Index: head/graphics/xv/Makefile =================================================================== --- head/graphics/xv/Makefile (revision 4558) +++ head/graphics/xv/Makefile (revision 4559) @@ -1,29 +1,27 @@ # New ports collection makefile for: xv # Version required: 3.10a # Date created: 30 October 1994 # Whom: smace # -# $Id: Makefile,v 1.11 1996/03/06 12:53:01 asami Exp $ +# $Id: Makefile,v 1.12 1996/09/22 08:56:34 andreas Exp $ # DISTNAME= xv-3.10a -CATEGORIES+= graphics x11 +CATEGORIES= graphics x11 MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= xv-3.10a.JPEG-patch # xv-3.10a.TIFF-patch (for tiff3.4) -LIB_DEPENDS= jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ - tiff\\.3\\.:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \ + tiff\\.3\\.3:${PORTSDIR}/graphics/tiff USE_IMAKE= yes post-install: mkdir -p ${PREFIX}/share/doc/xv cp ${WRKSRC}/README ${PREFIX}/share/doc/xv .if !defined(NOPORTDOCS) cp ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv .endif - -pre-clean: - @(cd ${PORTSDIR}/graphics/jpeg ; ${MAKE} clean) - @(cd ${PORTSDIR}/graphics/tiff ; ${MAKE} clean) .include Property changes on: head/graphics/xv/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/graphics/xv/distinfo =================================================================== --- head/graphics/xv/distinfo (revision 4558) +++ head/graphics/xv/distinfo (revision 4559) @@ -1 +1,2 @@ MD5 (xv-3.10a.tar.gz) = 2d4fbeec1561304362781cc8e2f7f72d +MD5 (xv-3.10a.JPEG-patch) = bd3ac79fa805319f583ccd382bdc825d Property changes on: head/graphics/xv/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/xv/files/patch-ab =================================================================== --- head/graphics/xv/files/patch-ab (nonexistent) +++ head/graphics/xv/files/patch-ab (revision 4559) @@ -0,0 +1,79 @@ +*** vdcomp.c.orig Fri Dec 23 01:34:47 1994 +--- vdcomp.c Mon Nov 18 02:52:59 1996 +*************** +*** 108,114 **** + !defined(bsd43) && \ + !defined(aux) && \ + !defined(__bsdi__) && \ +! !defined(sequent) + + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include /* it's in 'sys' on HPs and NeXT */ +--- 108,115 ---- + !defined(bsd43) && \ + !defined(aux) && \ + !defined(__bsdi__) && \ +! !defined(sequent) && \ +! !defined(__FreeBSD__) + + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include /* it's in 'sys' on HPs and NeXT */ +*************** +*** 429,438 **** + { + short shortint; + typedef long off_t; + + if (inname[0] == ' ') { + printf("\nEnter name of file to be decompressed: "); +! gets (inname); + } + + if (host == 1 | host == 2) { +--- 430,442 ---- + { + short shortint; + typedef long off_t; ++ char *s; + + if (inname[0] == ' ') { + printf("\nEnter name of file to be decompressed: "); +! fgets (inname, sizeof(inname), stdin); +! if ((s = strchr(inname, '\n')) != NULL) +! *s = '\0'; + } + + if (host == 1 | host == 2) { +*************** +*** 474,486 **** + printf("\n 3. VICAR format."); + printf("\n 4. Unlabelled binary array.\n"); + printf("\n Enter format number:"); +! gets(inname); + output_format = atoi(inname); + } while (output_format < 1 || output_format > 4); + + if (outname[0] == ' ') { + printf("\nEnter name of uncompressed output file: "); +! gets (outname); + } + + return(host); +--- 478,494 ---- + printf("\n 3. VICAR format."); + printf("\n 4. Unlabelled binary array.\n"); + printf("\n Enter format number:"); +! fgets (inname, sizeof(inname), stdin); +! if ((s = strchr(inname, '\n')) != NULL) +! *s = '\0'; + output_format = atoi(inname); + } while (output_format < 1 || output_format > 4); + + if (outname[0] == ' ') { + printf("\nEnter name of uncompressed output file: "); +! fgets (outname, sizeof(outname), stdin); +! if ((s = strchr(outname, '\n')) != NULL) +! *s = '\0'; + } + + return(host); Property changes on: head/graphics/xv/files/patch-ab ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/xv/files/patch-ad =================================================================== --- head/graphics/xv/files/patch-ad (revision 4558) +++ head/graphics/xv/files/patch-ad (revision 4559) @@ -1,74 +1,62 @@ --- ./Imakefile.org Fri Jan 13 12:24:01 1995 +++ ./Imakefile Wed Jul 5 03:32:57 1995 @@ -6,13 +6,15 @@ /* if, for whatever reason, you're unable to get the JPEG library to compile * on your machine, *COMMENT OUT* the following line */ -#define HaveJpeg +/* #define HaveJpeg */ +#define UseInstalledJpeg /* if, for whatever reason, you're unable to get the TIFF library to compile * on your machine, *COMMENT OUT* the following line */ -#define HaveTiff +/* #define HaveTiff */ +#define UseInstalledTiff /* if, for whatever reason, you're unable to get the PDS/VICAR support @@ -119,16 +121,30 @@ JPEG = -DDOJPEG JPEGDIR = jpeg LIBJPEG = $(JPEGDIR)/libjpeg.a +DEPLIBJPEG = $(LIBJPEG) JPEGINCLUDE = -I$(JPEGDIR) #endif +#ifdef UseInstalledJpeg +JPEG = -DDOJPEG +LIBJPEG = -L/usr/local/lib -ljpeg +JPEGINCLUDE = -I/usr/local/include +#endif + #ifdef HaveTiff TIFF = -DDOTIFF TIFFDIR = tiff LIBTIFF = $(TIFFDIR)/libtiff.a +DEPLIBTIFF = $(LIBTIFF) TIFFINCLUDE = -I$(TIFFDIR) #endif +#ifdef UseInstalledTiff +TIFF = -DDOTIFF +LIBTIFF = -L/usr/local/lib -ltiff +TIFFINCLUDE = -I/usr/local/include +#endif + #ifdef HavePDS PDS = -DDOPDS #endif @@ -142,8 +158,8 @@ #endif -DEPLIBS = $(LIBJPEG) $(LIBTIFF) -LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS) +DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) +LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \ $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \ ---- ./vdcomp.c.org Thu Dec 22 14:34:47 1994 -+++ ./vdcomp.c Wed Jul 5 03:39:26 1995 -@@ -108,7 +108,8 @@ - !defined(bsd43) && \ - !defined(aux) && \ - !defined(__bsdi__) && \ -- !defined(sequent) -+ !defined(sequent) && \ -+ !defined(__FreeBSD__) - - # if defined(hp300) || defined(hp800) || defined(NeXT) - # include /* it's in 'sys' on HPs and NeXT */ Property changes on: head/graphics/xv/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/graphics/xv/pkg-plist =================================================================== --- head/graphics/xv/pkg-plist (revision 4558) +++ head/graphics/xv/pkg-plist (revision 4559) @@ -1,13 +1,12 @@ -@cwd /usr/X11R6 bin/xv bin/bggen bin/vdcomp bin/xcmap bin/xvpictoppm man/man1/xv.1.gz man/man1/bggen.1.gz man/man1/vdcomp.1.gz man/man1/xcmap.1.gz man/man1/xvpictoppm.1.gz share/doc/xv/README share/doc/xv/xvdocs.ps Property changes on: head/graphics/xv/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property