Attachment 10026 Details for Bug 20266 – file.diff

[patch] file.diff

file.diff (text/plain), 11.48 KB, created by tkato on 2000-07-28 20:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-07-28 20:00:02 UTC

Size: 11.48 KB

patch

obsolete

>diff -urN /usr/ports/print/ghostscript55/Makefile print/ghostscript55/Makefile
>--- /usr/ports/print/ghostscript55/Makefile	Thu Jul 27 21:08:20 2000
>+++ print/ghostscript55/Makefile	Sat Jul 29 00:44:04 2000
>@@ -6,38 +6,37 @@
> #
> 
> PORTNAME=	ghostscript
>-PORTVERSION=	5.50
>+PORTVERSION=	5.50a
> CATEGORIES=	print
>-MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
>-		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
>-		http://www.ozemail.com.au/~geoffk/pdfencrypt/
>+MASTER_SITES=	${MASTER_SITE_GNU} \
>+		ftp://ftp.cs.wisc.edu/ghost/gnu/gs550/ \
>+		ftp://ftp.cs.wisc.edu/ghost/gnu/fonts/ \
>+		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/
>+MASTER_SITE_SUBDIR=	${PORTNAME}
> DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
>-		${HP850_DRV} ${DECRYPT_PDF}
>+		${HP850_DRV}
>+EXTRACT_ONLY=	${GS_SOURCES}
> 
> MAINTAINER=	andreas@FreeBSD.org
> 
>-Y2K=		http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
>-
> BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
>-		/nonexistent:${PORTSDIR}/graphics/png:extract \
> 		unzip:${PORTSDIR}/archivers/unzip
> LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
> 
>-USE_XLIB=	yes
>-EXTRACT_ONLY=	${GS_SOURCES}
> WRKSRC=		${WRKDIR}/gs5.50
>+
>+USE_XLIB=	yes
> USE_GMAKE=	yes
> MAKEFILE=	unix-gcc.mak
> MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
> 
>-GS_SOURCES=	ghostscript-5.50.tar.gz
>-GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
>+GS_SOURCES=	gnu-gs-5.50a.tar.gz
> #  Note: the following two are real files that have symlinks with
> #  later version numbers pointing to them.  To avoid unnecessarily
> #  downloading distfiles, do not change these when upgrading the port
> #  unless the files really change.
>-GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
>-GS_FONTS_OTHER=	ghostscript-fonts-other-5.50.tar.gz
>+GS_FONTS_STD=	gnu-gs-fonts-std-6.0.tar.gz
>+GS_FONTS_OTHER=	gnu-gs-fonts-other-6.0.tar.gz
> 
> # Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
> HP850_DRV=	hp8xxs13.zip
>@@ -55,10 +54,7 @@
> 
> post-extract:
> 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
>-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng ${WRKSRC}/libpng
>-	${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak
>-	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
>-	${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak
>+	unzip -L -q -aa -o ${DISTDIR}/${HP850_DRV} -d ${WRKSRC} -x devs.mak
> 
> do-configure:
> .if defined(BATCH)
>@@ -71,11 +67,9 @@
> 	${MKDIR} ${WRKSRC}/obj
> 
> pre-install:
>-	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
>-	(cd ${PREFIX}/share/ghostscript ; \
>-			${TAR} -xzf ${DISTDIR}/${GS_FONTS_STD})
>-	(cd ${PREFIX}/share/ghostscript/fonts ; \
>-			${TAR} -xzf ${DISTDIR}/${GS_FONTS_OTHER})
>+	@${MKDIR} ${PREFIX}/share/ghostscript
>+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
>+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
> 
> # install the readme and license file of the hp8xxx driver as well
> post-install:
>diff -urN /usr/ports/print/ghostscript55/files/md5 print/ghostscript55/files/md5
>--- /usr/ports/print/ghostscript55/files/md5	Mon Jan  4 12:36:01 1999
>+++ print/ghostscript55/files/md5	Fri Jul 28 21:54:12 2000
>@@ -1,6 +1,5 @@
>-MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
>-MD5 (ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
>-MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
>-MD5 (ghostscript-fonts-other-5.50.tar.gz) = e3540578f33caf5dfc384e5518890f57
>+MD5 (gnu-gs-5.50a.tar.gz) = c12ea8dd56cfc453c99bd8864dfc90db
>+MD5 (gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
>+MD5 (gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
> MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
> MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
>diff -urN /usr/ports/print/ghostscript55/patches/patch-aa print/ghostscript55/patches/patch-aa
>--- /usr/ports/print/ghostscript55/patches/patch-aa	Thu Dec  3 17:24:20 1998
>+++ print/ghostscript55/patches/patch-aa	Sat Jul 29 00:40:59 2000
>@@ -1,6 +1,6 @@
>---- unix-gcc.mak.orig	Thu Sep 17 08:06:06 1998
>-+++ unix-gcc.mak	Mon Nov 30 13:11:05 1998
>-@@ -48,12 +48,10 @@
>+--- unix-gcc.mak.orig	Mon Feb 14 11:28:41 2000
>++++ unix-gcc.mak	Sat Jul 29 00:40:45 2000
>+@@ -54,12 +54,10 @@
>  # the directories also define the default search path for the
>  # initialization files (gs_*.ps) and the fonts.
>  
>@@ -16,7 +16,15 @@
>  exec_prefix = $(prefix)
>  bindir = $(exec_prefix)/bin
>  scriptdir = $(bindir)
>-@@ -141,7 +139,7 @@
>+@@ -140,14 +138,14 @@
>+ # You may need to change this if the libpng version changes.
>+ # See libpng.mak for more information.
>+ 
>+-PSRCDIR=libpng
>++PSRCDIR=${LOCALBASE}/include
>+ PVERSION=96
>+ 
>+ # Choose whether to use a shared version of the PNG library, and if so,
>  # what its name is.
>  # See gs.mak and Make.htm for more information.
>  
>@@ -25,7 +33,7 @@
>  LIBPNG_NAME=png
>  
>  # Define the directory where the zlib sources are stored.
>-@@ -153,7 +151,7 @@
>+@@ -159,7 +157,7 @@
>  # what its name is (usually libz, but sometimes libgz).
>  # See gs.mak and Make.htm for more information.
>  
>@@ -34,16 +42,16 @@
>  #ZLIB_NAME=gz
>  ZLIB_NAME=z
>  
>-@@ -172,7 +170,7 @@
>+@@ -178,7 +176,7 @@
>  
>  # Define the name of the C compiler.
>  
> -CC=gcc
>-+CC=cc
>++#CC=cc
>  
>  # Define the name of the linker for the final link step.
>  # Normally this is the same as the C compiler.
>-@@ -205,7 +203,7 @@
>+@@ -211,7 +209,7 @@
>  #   gcc to accept ANSI-style function prototypes and function definitions.
>  XCFLAGS=
>  
>@@ -52,16 +60,16 @@
>  
>  # Define platform flags for ld.
>  # SunOS 4.n may need -Bstatic.
>-@@ -214,7 +212,7 @@
>+@@ -220,7 +218,7 @@
>  #	-R /usr/local/xxx/lib:/usr/local/lib
>  # giving the full path names of the shared library directories.
>  # XLDFLAGS can be set from the command line.
> -XLDFLAGS=
>-+XLDFLAGS=-L$(prefix)/lib
>++XLDFLAGS=-L${LOCALBASE}/lib
>  
>  LDFLAGS=$(XLDFLAGS) -fno-common
>  
>-@@ -234,7 +232,7 @@
>+@@ -240,7 +238,7 @@
>  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
>  # not in $(XINCLUDE).
>  
>@@ -70,7 +78,7 @@
>  
>  # Define the directory/ies and library names for the X11 library files.
>  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
>-@@ -246,12 +244,12 @@
>+@@ -252,12 +250,12 @@
>  # Solaris and other SVR4 systems with dynamic linking probably want
>  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
>  # X11R6 (on any platform) may need
>@@ -86,7 +94,7 @@
>  
>  # Define whether this platform has floating point hardware:
>  #	FPU_TYPE=2 means floating point is faster than fixed point.
>-@@ -292,27 +290,6 @@
>+@@ -298,27 +296,6 @@
>  
>  FILE_IMPLEMENTATION=stdio
>  
>@@ -114,7 +122,7 @@
>  # ---------------------------- End of options --------------------------- #
>  
>  # Define the name of the partial makefile that specifies options --
>-@@ -320,16 +297,10 @@
>+@@ -326,16 +303,10 @@
>  
>  MAKEFILE=$(GLSRC)unix-gcc.mak
>  
>@@ -132,7 +140,7 @@
>  CCAUX=$(CC)
>  #We can't use -fomit-frame-pointer with -pg....
>  #CC_LEAF=$(CC_)
>-@@ -350,7 +321,3 @@
>+@@ -356,7 +327,3 @@
>  include $(GLSRC)unixtail.mak
>  include $(GLSRC)unix-end.mak
>  include $(GLSRC)unixinst.mak
>diff -urN /usr/ports/print/ghostscript55/patches/patch-ad print/ghostscript55/patches/patch-ad
>--- /usr/ports/print/ghostscript55/patches/patch-ad	Thu Jan  1 09:00:00 1970
>+++ print/ghostscript55/patches/patch-ad	Fri Jul 28 23:53:27 2000
>@@ -0,0 +1,34 @@
>+--- gp_unifs.c.orig	Mon Feb 14 11:28:25 2000
>++++ gp_unifs.c	Fri Jul 28 23:53:04 2000
>+@@ -33,6 +33,7 @@
>+ #include "stat_.h"
>+ #include "dirent_.h"
>+ #include <sys/param.h>		/* for MAXPATHLEN */
>++#include <unistd.h>
>+ 
>+ /* Some systems (Interactive for example) don't define MAXPATHLEN,
>+  * so we define it here.  (This probably should be done via a Config-Script.)
>+@@ -63,6 +64,8 @@
>+ 		     const char *mode)
>+ {				/* The -8 is for XXXXXX plus a possible final / and -. */
>+     int len = gp_file_name_sizeof - strlen(prefix) - 8;
>++    int fd;
>++    FILE *f;
>+ 
>+     if (gp_getenv("TEMP", fname, &len) != 0)
>+ 	strcpy(fname, "/tmp/");
>+@@ -75,8 +78,12 @@
>+     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
>+ 	strcat(fname, "-");
>+     strcat(fname, "XXXXXX");
>+-    mktemp(fname);
>+-    return fopen(fname, mode);
>++    fd = mkstemp(fname);
>++    if (fd == -1)
>++    	return NULL;
>++    if ((f = fdopen(fd, mode)) == NULL)
>++    	close(fd);
>++    return f;
>+ }
>+ 
>+ /* Open a file with the given name, as a stream of uninterpreted bytes. */
>diff -urN /usr/ports/print/ghostscript55/pkg/COMMENT print/ghostscript55/pkg/COMMENT
>--- /usr/ports/print/ghostscript55/pkg/COMMENT	Sun Jun 27 04:12:22 1999
>+++ print/ghostscript55/pkg/COMMENT	Fri Jul 28 21:37:45 2000
>@@ -1 +1 @@
>-Aladdin Postscript interpreter
>+GNU Postscript interpreter
>diff -urN /usr/ports/print/ghostscript55/pkg/DESCR print/ghostscript55/pkg/DESCR
>--- /usr/ports/print/ghostscript55/pkg/DESCR	Mon May  3 13:59:22 1999
>+++ print/ghostscript55/pkg/DESCR	Fri Jul 28 21:36:39 2000
>@@ -1,13 +1,12 @@
>-This is Aladdin Ghostscript, the non-GPL version that comes with a licence
>-different from the GPL. Read the file PUBLIC in the work/gsX.Y directory or
>-in ${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
>-
>-Ghostscript is the well-known PostScript interpreter which is available for
>-all common and most esoteric platforms and supports many different printers
>-and some displays.
>+GNU Ghostscript is the name of a set of software that provides:
> 
>-Official ghostscript homepage, see:
>-	http://www.cs.wisc.edu/~ghost/index.html
>+	- An interpreter for the PostScript (TM) language, and
>+
>+	- A set of C procedures (the Ghostscript library) that implement
>+the graphics capabilities that appear as primitive operations in the
>+PostScript language.
>+
>+GNU Ghostscript comes with NO WARRANTY and NO SUPPORT.  
> 
> This FreeBSD port includes two useful add-on packages:
> 	o Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
>@@ -16,10 +15,8 @@
> 	o Support for pdfencrypt, see description on
> 	  	http://www.ozemail.com.au/~geoffk/pdfencrypt/
> 		
>-Thomas Merz has written a Ghostscript manual in PDF format:
>-	http://www.cs.wisc.edu/~ghost/merz.html
>+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
> 
>-The manual is also available in German language, see:
>-	http://www.muc.de/~tm/free/free.html
>+PostScript is a trademark of Adobe Systems, Incorporated.
> 
>-WWW: http://www.cs.wisc.edu/~ghost/index.html
>+WWW: http://www.gnu.org/software/ghostscript/ghostscript.html
>diff -urN /usr/ports/print/ghostscript55/pkg/PLIST print/ghostscript55/pkg/PLIST
>--- /usr/ports/print/ghostscript55/pkg/PLIST	Sat May 15 10:14:35 1999
>+++ print/ghostscript55/pkg/PLIST	Fri Jul 28 21:29:37 2000
>@@ -47,7 +47,6 @@
> share/ghostscript/5.50/doc/Bug-form.htm
> share/ghostscript/5.50/doc/C-style.htm
> share/ghostscript/5.50/doc/Commprod.htm
>-share/ghostscript/5.50/doc/Copying.htm
> share/ghostscript/5.50/doc/Current.htm
> share/ghostscript/5.50/doc/DLL.htm
> share/ghostscript/5.50/doc/Devices.htm
>@@ -67,10 +66,8 @@
> share/ghostscript/5.50/doc/Make.htm
> share/ghostscript/5.50/doc/New-user.htm
> share/ghostscript/5.50/doc/News.htm
>-share/ghostscript/5.50/doc/PUBLIC
> share/ghostscript/5.50/doc/Ps2pdf.htm
> share/ghostscript/5.50/doc/Psfiles.htm
>-share/ghostscript/5.50/doc/Public.htm
> share/ghostscript/5.50/doc/Readme.htm
> share/ghostscript/5.50/doc/Source.htm
> share/ghostscript/5.50/doc/Unix-lpr.htm
>@@ -252,6 +249,8 @@
> share/ghostscript/fonts/fhirw.pfm
> share/ghostscript/fonts/fkarw.gsf
> share/ghostscript/fonts/fkarw.pfm
>+share/ghostscript/fonts/fonts.dir
>+share/ghostscript/fonts/fonts.scale
> share/ghostscript/fonts/hrger.pfa
> share/ghostscript/fonts/hrgerb.gsf
> share/ghostscript/fonts/hrgerd.gsf

Actions: View | Diff

Attachments on bug 20266: 10026