Attachment 196848 Details for Bug 231148 – patch

[patch] patch

ghostscript.patch (text/plain), 8.50 KB, created by Tijl Coosemans on 2018-09-04 11:03:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2018-09-04 11:03:18 UTC

Size: 8.50 KB

patch

obsolete

>Index: print/ghostscript9-agpl-base/Makefile
>===================================================================
>--- print/ghostscript9-agpl-base/Makefile	(revision 478946)
>+++ print/ghostscript9-agpl-base/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ghostscript
>-PORTVERSION=	9.23
>-PORTREVISION=	1
>+PORTVERSION=	9.24
> CATEGORIES=	print
> MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
> PKGNAMESUFFIX=	9-agpl-base
>@@ -28,8 +27,10 @@ CONFLICTS_INSTALL= \
> 		ghostscript9-agpl-[0-9]* \
> 		ghostscript9-agpl-nox11-[0-9]*
> 
>-USES=		gmake iconv jpeg localbase pkgconfig tar:xz
>+USES=		cpe gmake iconv jpeg localbase pkgconfig tar:xz
>+USE_CSTD=	gnu99
> USE_LDCONFIG=	yes
>+CPE_VENDOR=	artifex
> DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
> DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
> GNU_CONFIGURE=	yes
>Index: print/ghostscript9-agpl-base/distinfo
>===================================================================
>--- print/ghostscript9-agpl-base/distinfo	(revision 478946)
>+++ print/ghostscript9-agpl-base/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1523106984
>-SHA256 (ghostscript-9.23.tar.xz) = 1fcedc27d4d6081105cdf35606cb3f809523423a6cf9e3c23cead3525d6ae8d9
>-SIZE (ghostscript-9.23.tar.xz) = 33426160
>+TIMESTAMP = 1536049976
>+SHA256 (ghostscript-9.24.tar.xz) = d44917df24979a05e0cb3916531928cc2adc91f5b17b419ee023d16ab31069d6
>+SIZE (ghostscript-9.24.tar.xz) = 33015704
>Index: print/ghostscript9-agpl-base/files/patch-base-stdpre.h
>===================================================================
>--- print/ghostscript9-agpl-base/files/patch-base-stdpre.h	(revision 478946)
>+++ print/ghostscript9-agpl-base/files/patch-base-stdpre.h	(nonexistent)
>@@ -1,12 +0,0 @@
>---- base/stdpre.h.orig	2018-03-21 08:48:06 UTC
>-+++ base/stdpre.h
>-@@ -94,7 +94,8 @@
>- #endif
>- 
>- /* restrict is standard in C99, but not in all C++ compilers. */
>--#if __STDC_VERSION__ == 199901L /* C99 */
>-+#if __STDC_VERSION__ >= 199901L /* C99 */
>-+#define gs_restrict restrict
>- #elif defined(_MSC_VER) && _MSC_VER >= 1500 /* MSVC 9 or newer */
>- #define gs_restrict __restrict
>- #elif __GNUC__ >= 3 /* GCC 3 or newer */
>
>Property changes on: print/ghostscript9-agpl-base/files/patch-base-stdpre.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: print/ghostscript9-agpl-base/files/patch-configure
>===================================================================
>--- print/ghostscript9-agpl-base/files/patch-configure	(revision 478946)
>+++ print/ghostscript9-agpl-base/files/patch-configure	(working copy)
>@@ -1,6 +1,17 @@
>---- configure.orig	2018-03-21 08:49:04 UTC
>+--- configure.orig	2018-09-03 08:51:26 UTC
> +++ configure
>-@@ -5100,7 +5100,7 @@ if test "${enable_threadsafe+set}" = set; then :
>+@@ -4357,8 +4357,8 @@ else
>+         ;;
>+         *BSD)
>+         if test $ac_cv_c_compiler_gnu = yes; then
>+-            CC_OPT_FLAGS_TO_TRY="-O2"
>+-            CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
>++            CC_OPT_FLAGS_TO_TRY=""
>++            CC_DBG_FLAGS_TO_TRY=""
>+         fi
>+         ;;
>+         Darwin*)
>+@@ -5143,7 +5143,7 @@ if test "${enable_threadsafe+set}" = set; then :
>  fi
>  
>  if test x$enable_threadsafe = xyes ; then
>@@ -9,7 +20,7 @@
>  fi
>  
>  
>-@@ -5762,7 +5762,6 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
>+@@ -5805,7 +5805,6 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
>@@ -17,7 +28,7 @@
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  
>-@@ -5795,7 +5794,7 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
>+@@ -5838,7 +5837,7 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
>  if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
>    ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
>  if test "x$ac_cv_header_dlfcn_h" = xyes; then :
>@@ -26,7 +37,7 @@
>  fi
>  
>  
>-@@ -9950,42 +9949,42 @@ if test x$enable_threadsafe = xyes; then
>+@@ -10041,42 +10040,42 @@ if test x$enable_threadsafe = xyes; then
>  
>    for ntsdev in $NTS_DEVS ; do
>      NTS_EXCLUDES="$(echo \"$P_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
>@@ -77,7 +88,7 @@
>    done
>  
>    NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "`
>-@@ -10145,7 +10144,12 @@ if test "${enable_dynamic+set}" = set; then :
>+@@ -10251,7 +10250,12 @@ if test "${enable_dynamic+set}" = set; then :
>        DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
>        ;;
>        *BSD)
>Index: print/ghostscript9-agpl-base/pkg-plist
>===================================================================
>--- print/ghostscript9-agpl-base/pkg-plist	(revision 478946)
>+++ print/ghostscript9-agpl-base/pkg-plist	(working copy)
>@@ -79,40 +79,23 @@ share/color/icc/ghostscript/ps_rgb.icc
> share/color/icc/ghostscript/sgray.icc
> share/color/icc/ghostscript/srgb.icc
> %%PORTDOCS%%%%DOCSDIR%%/API.htm
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/C-style.htm
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%/Changes.htm
> %%PORTDOCS%%%%DOCSDIR%%/Commprod.htm
> %%PORTDOCS%%%%DOCSDIR%%/DLL.htm
> %%PORTDOCS%%%%DOCSDIR%%/Deprecated.htm
>-%%PORTDOCS%%%%DOCSDIR%%/Details.htm
>-%%PORTDOCS%%%%DOCSDIR%%/Details8.htm
>-%%PORTDOCS%%%%DOCSDIR%%/Details9.htm
> %%PORTDOCS%%%%DOCSDIR%%/Develop.htm
> %%PORTDOCS%%%%DOCSDIR%%/Devices.htm
> %%PORTDOCS%%%%DOCSDIR%%/Drivers.htm
> %%PORTDOCS%%%%DOCSDIR%%/Fonts.htm
> %%PORTDOCS%%%%DOCSDIR%%/GS9_Color_Management.pdf
> %%PORTDOCS%%%%DOCSDIR%%/GS9_Color_Management.tex
>-%%PORTDOCS%%%%DOCSDIR%%/Helpers.htm
>-%%PORTDOCS%%%%DOCSDIR%%/Hershey.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History1.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History2.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History3.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History4.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History5.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History6.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History7.htm
>-%%PORTDOCS%%%%DOCSDIR%%/History8.htm
> %%PORTDOCS%%%%DOCSDIR%%/History9.htm
> %%PORTDOCS%%%%DOCSDIR%%/Install.htm
>-%%PORTDOCS%%%%DOCSDIR%%/Issues.htm
> %%PORTDOCS%%%%DOCSDIR%%/Language.htm
> %%PORTDOCS%%%%DOCSDIR%%/Lib.htm
> %%PORTDOCS%%%%DOCSDIR%%/Make.htm
> %%PORTDOCS%%%%DOCSDIR%%/News.htm
>-%%PORTDOCS%%%%DOCSDIR%%/Projects.htm
> %%PORTDOCS%%%%DOCSDIR%%/Ps-style.htm
> %%PORTDOCS%%%%DOCSDIR%%/Ps2epsi.htm
> %%PORTDOCS%%%%DOCSDIR%%/Psfiles.htm
>@@ -124,8 +107,8 @@ share/color/icc/ghostscript/srgb.icc
> %%PORTDOCS%%%%DOCSDIR%%/Use.htm
> %%PORTDOCS%%%%DOCSDIR%%/VectorDevices.htm
> %%PORTDOCS%%%%DOCSDIR%%/WhatIsGS.htm
>+%%PORTDOCS%%%%DOCSDIR%%/gdevds32.c
> %%PORTDOCS%%%%DOCSDIR%%/gs-vms.hlp
>-%%PORTDOCS%%%%DOCSDIR%%/gs.css
> %%PORTDOCS%%%%DOCSDIR%%/gsdoc.el
> %%PORTDOCS%%%%DOCSDIR%%/index.html
> %%PORTDOCS%%%%DOCSDIR%%/pscet_status.txt
>Index: print/ghostscript9-agpl-x11/Makefile
>===================================================================
>--- print/ghostscript9-agpl-x11/Makefile	(revision 478946)
>+++ print/ghostscript9-agpl-x11/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ghostscript
>-PORTVERSION=	9.23
>-PORTREVISION=	1
>+PORTVERSION=	9.24
> CATEGORIES=	print
> MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
> PKGNAMESUFFIX=	9-agpl-x11
>@@ -18,10 +17,13 @@ CONFLICTS_INSTALL= \
> 		ghostscript9-agpl-[0-9]* \
> 		ghostscript9-agpl-nox11-[0-9]*
> 
>+DISTINFO_FILE=	${.CURDIR:H}/ghostscript9-agpl-base/distinfo
> PATCHDIR=	${.CURDIR:H}/ghostscript9-agpl-base/files
>-USES=		ghostscript:agpl gmake iconv localbase pkgconfig tar:xz
>+USES=		cpe ghostscript:agpl gmake iconv localbase pkgconfig tar:xz
>+USE_CSTD=	gnu99
> USE_LDCONFIG=	yes
> USE_XORG=	ice sm x11 xext xt
>+CPE_VENDOR=	artifex
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-compile-inits \
> 		--disable-cups \
>Index: print/ghostscript9-agpl-x11/distinfo
>===================================================================
>--- print/ghostscript9-agpl-x11/distinfo	(revision 478946)
>+++ print/ghostscript9-agpl-x11/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1525773446
>-SHA256 (ghostscript-9.23.tar.xz) = 1fcedc27d4d6081105cdf35606cb3f809523423a6cf9e3c23cead3525d6ae8d9
>-SIZE (ghostscript-9.23.tar.xz) = 33426160
>
>Property changes on: print/ghostscript9-agpl-x11/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231148: 196848