(1) Bump version 8.71 to 9.05 (importing from wip/ghostscript).
  For the Changes: See
    share/ghostscript/9.05/doc/History9.htm
  Or
    work/ghostscript-9.05/doc/History9.htm
  Upstream releases and their date are:
        Version 9.05 (2012-02-08)
        Version 9.04 (2011-08-05)
        Version 9.02 (2011-03-30)
        Version 9.01 (2011-02-07)
        Version 9.00 (2010-09-14)

(2) Resolve pkg PR/44400.
options.mk:
  - Have new option disable-compile-inits
Makefile
  - rename cidfmap to cidfmap-dist (post-extract:)

(3) Have new file Makefile.common to share with
    fonts/ghostscript-cidfonts
    fonts/ghostscript-cidfonts-ryumin
  to set ${GS_VERSION}, and then ${GS_RESOURCEDIR}.

(4) options.mk
 - Add new options,
   disable-compile-inits
 - Add following line for non X11 installation
   CONFIGURE_ARGS+=       --disable-freetype
 - Name change
   pstorater.convs -> gstoraster.convs

(5) PLIST
  So many changes, but just a note:
  -share/ghostscript/${PKGVERSION}/doc/README
   share/ghostscript/${PKGVERSION}/doc/Readme.htm

(6)
patches directory:
Removed, for upstream included.
------
patch-aa   9.00	base/gsnogc.c
patch-ab   9.05	base/unixinst.mak
patch-ac   9.00	ase/gdevpx.c
patch-ad   9.04	lib/pv.sh
patch-ae   9.00	psi/zfile.c
patch-ag   9.00	cups/cups.mak

patch-ak   9.04	->  a part left in patch-base_gdevpng.c
patch-am   9.00	lib/pdf2dsc.ps

patch-ba   9.00	psi/idosave.h
patch-bb   9.00	psi/isave.c	(CVS-2010-1628)
patch-bc   9.00	psi/ialloc.c	(CVS-2010-1628)

patch-bd   9.00 (1) bug #691029 and #691108
           9.00 (2) arrayoption() macro
	   9.00 (3) silence compiler warning

Modified, or unchanged
------
patch-af  (Add comments from former commit log, and adjust)
patch-ah  (Add comments from former commit log, and adjust)
patch-ai  (Add comments from former commit log, and adjust)
patch-aj  (unchanged)
patch-al  (unchanged)
patch-an  (Add comments from former commit log, and adjust)

Added
--------
patch-base_gdevpng.c	(a part of previous patch-ak)
patch-base_gserrors_h	(silence compile warning)
patch-configure.ac	(For just a record, see patch-ah (configure))
patch-freetype_include_freetype_internal_t1types_h (To avoid redifintion of T1_EncodingType_ )
patch-openjpeg_libopenjpeg_opj_malloc_h (To avoid undefined ref. to memalign)

OK'ed by wiz@, thanks a lot.


(mef)

$NetBSD: patch-base_gdevpng.c,v 1.1 2012/10/07 14:19:18 mef Exp $

The patch was included in patches/patch-ak:
  revision 1.5
  date: 2011/01/15 14:08:10;  author: wiz;  state: Exp;  lines: +194 -29
  Fix build with png-1.5. Patch from John Bowler in private mail.

  and 'fix for build with png-1.5' is now included in upstream in different
  shape, so some left out is here:

--- base/gdevpng.c.orig	2011-08-05 20:12:20.000000000 +0900
+++ base/gdevpng.c	2011-08-22 19:04:12.000000000 +0900
@@ -40,8 +40,11 @@
 /*
  * libpng versions 1.0.3 and later allow disabling access to the stdxxx
  * files while retaining support for FILE * I/O.
+ *
+ * This is a misunderstanding - this is a build time option for libpng,
+ * it has no effect on a user of libpng.
  */
-#define PNG_NO_CONSOLE_IO
+/*#define PNG_NO_CONSOLE_IO*/
 /*
  * Earlier libpng versions require disabling FILE * I/O altogether.
  * This produces a compiler warning about no prototype for png_init_io.

$NetBSD: patch-base_gserrors_h,v 1.1 2012/10/07 14:19:18 mef Exp $
# This suppresses the noisy warning that __func__ redefined

--- base/gserrors.h.orig	2012-02-08 17:48:48.000000000 +0900
+++ base/gserrors.h	2012-03-24 07:26:35.000000000 +0900
@@ -53,6 +53,9 @@
 #define return_error(err) return gs_note_error(err)
 
 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+#  if (defined(__func__))
+#    undef __func__
+#  endif
 #  if defined(__GNUC__) && __GNUC__ >= 2
 #    define __func__ __FUNCTION__
 #  elif defined(__FUNCTION__)

$NetBSD: patch-configure.ac,v 1.1 2012/10/07 14:19:18 mef Exp $

See patch-ah (configure)

--- base/configure.ac.orig	2011-08-05 20:12:20.000000000 +0900
+++ base/configure.ac	2011-08-22 19:10:30.000000000 +0900
@@ -404,7 +404,7 @@
 fi
 
 if test x$with_libpaper != xno; then
-    LIBS="$LIBS -lpaper"
+    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
     AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
     CFLAGS="$CFLAGS -DUSE_LIBPAPER"
 fi

$NetBSD: patch-freetype_include_freetype_internal_t1types_h,v 1.1 2012/10/07 14:19:18 mef Exp $

To avoid redifintion of T1_EncodingType_ by:
.include "../../fonts/fontconfig/buildlink3.mk"
|
v
.include "../../graphics/freetype2/buildlink3.mk"

--- freetype/include/freetype/internal/t1types.h.orig	2011-08-05 20:12:21.000000000 +0900
+++ freetype/include/freetype/internal/t1types.h	2011-12-09 21:24:06.000000000 +0900
@@ -78,6 +78,7 @@
   } T1_EncodingRec, *T1_Encoding;
 
 
+#ifndef  __T1TABLES_H__
   typedef enum  T1_EncodingType_
   {
     T1_ENCODING_TYPE_NONE = 0,
@@ -87,6 +88,7 @@
     T1_ENCODING_TYPE_EXPERT
 
   } T1_EncodingType;
+#endif
 
 
   /* used to hold extra data of PS_FontInfoRec that

$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.1 2012/10/07 14:19:19 mef Exp $

To avoid following problem:
| gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \
| -L./sobin -Wl,-R/usr/pkg/lib -lgs
| ./sobin/libgs.so: undefined reference to `memalign'
| gmake[2]: *** [sobin/gsc] Error 1

--- openjpeg/libopenjpeg/opj_malloc.h.orig	2012-04-18 22:36:57.000000000 +0900
+++ openjpeg/libopenjpeg/opj_malloc.h	2012-04-18 22:54:13.000000000 +0900
@@ -84,7 +84,7 @@
 	#if defined(__sun)
 		#define HAVE_MEMALIGN
 	/* Linux x86_64 and OSX always align allocations to 16 bytes */
-	#elif !defined(__amd64__) && !defined(__APPLE__)	
+	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__)
 		#define HAVE_MEMALIGN
 		#include <malloc.h>			
 	#endif