o fix build of HPinkjet driver.

o change WWW.

PR:		33797
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

9 files changed, 15 insertions, 48 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index ead4761f1346..6e4971d8732e 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -170,8 +170,9 @@ post-patch:
 	${PERL} -pi -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
 # for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"||g ; \
-		 s|CXXFLAGS="-O2 -Wall"||g' ${WRKSRC}/${HPIJS_NAME}/configure
+	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS -O0"|g ; \
+		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS -O0"|g' \
+			${WRKSRC}/${HPIJS_NAME}/configure
 	find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
 		's|#include <malloc.h>||g'
 
diff --git a/print/ghostscript-afpl/files/patch-hpijs-1.0:configure.in b/print/ghostscript-afpl/files/patch-hpijs-1.0:configure.in
deleted file mode 100644
index ff76f69888c3..000000000000
--- a/print/ghostscript-afpl/files/patch-hpijs-1.0:configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- hpijs-1.0/configure.in.orig	Fri Jan 11 22:01:55 2002
-+++ hpijs-1.0/configure.in	Fri Jan 11 22:02:22 2002
-@@ -39,8 +39,8 @@
-    CXXFLAGS="-g -Wall"
-    AC_MSG_RESULT(debug)
- else
--   CFLAGS="-O2 -Wall"
--   CXXFLAGS="-O2 -Wall"
-+   CFLAGS="-pipe -Wall"
-+   CXXFLAGS="-pipe -Wall"
-    AC_MSG_RESULT(release)
- fi
- 
diff --git a/print/ghostscript-afpl/pkg-descr b/print/ghostscript-afpl/pkg-descr
index 91c0059c2bf6..18c09162ed5f 100644
--- a/print/ghostscript-afpl/pkg-descr
+++ b/print/ghostscript-afpl/pkg-descr
@@ -21,4 +21,5 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://hpinkjet.sourceforge.net/
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
-WWW: http://www.cs.wisc.edu/~ghost/index.html
+
+WWW: http://www.cs.wisc.edu/~ghost/doc/AFPL/index.html
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index ead4761f1346..6e4971d8732e 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -170,8 +170,9 @@ post-patch:
 	${PERL} -pi -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
 # for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"||g ; \
-		 s|CXXFLAGS="-O2 -Wall"||g' ${WRKSRC}/${HPIJS_NAME}/configure
+	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS -O0"|g ; \
+		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS -O0"|g' \
+			${WRKSRC}/${HPIJS_NAME}/configure
 	find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
 		's|#include <malloc.h>||g'
 
diff --git a/print/ghostscript-gpl/files/patch-hpijs-1.0:configure.in b/print/ghostscript-gpl/files/patch-hpijs-1.0:configure.in
deleted file mode 100644
index ff76f69888c3..000000000000
--- a/print/ghostscript-gpl/files/patch-hpijs-1.0:configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- hpijs-1.0/configure.in.orig	Fri Jan 11 22:01:55 2002
-+++ hpijs-1.0/configure.in	Fri Jan 11 22:02:22 2002
-@@ -39,8 +39,8 @@
-    CXXFLAGS="-g -Wall"
-    AC_MSG_RESULT(debug)
- else
--   CFLAGS="-O2 -Wall"
--   CXXFLAGS="-O2 -Wall"
-+   CFLAGS="-pipe -Wall"
-+   CXXFLAGS="-pipe -Wall"
-    AC_MSG_RESULT(release)
- fi
- 
diff --git a/print/ghostscript-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index 91c0059c2bf6..18c09162ed5f 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -21,4 +21,5 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://hpinkjet.sourceforge.net/
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
-WWW: http://www.cs.wisc.edu/~ghost/index.html
+
+WWW: http://www.cs.wisc.edu/~ghost/doc/AFPL/index.html
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index ead4761f1346..6e4971d8732e 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -170,8 +170,9 @@ post-patch:
 	${PERL} -pi -e 's|\. de|\.|g' \
 		${WRKSRC}/src/unixinst.mak
 # for HPinkjet driver
-	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"||g ; \
-		 s|CXXFLAGS="-O2 -Wall"||g' ${WRKSRC}/${HPIJS_NAME}/configure
+	${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS -O0"|g ; \
+		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS -O0"|g' \
+			${WRKSRC}/${HPIJS_NAME}/configure
 	find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
 		's|#include <malloc.h>||g'
 
diff --git a/print/ghostscript8/files/patch-hpijs-1.0:configure.in b/print/ghostscript8/files/patch-hpijs-1.0:configure.in
deleted file mode 100644
index ff76f69888c3..000000000000
--- a/print/ghostscript8/files/patch-hpijs-1.0:configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- hpijs-1.0/configure.in.orig	Fri Jan 11 22:01:55 2002
-+++ hpijs-1.0/configure.in	Fri Jan 11 22:02:22 2002
-@@ -39,8 +39,8 @@
-    CXXFLAGS="-g -Wall"
-    AC_MSG_RESULT(debug)
- else
--   CFLAGS="-O2 -Wall"
--   CXXFLAGS="-O2 -Wall"
-+   CFLAGS="-pipe -Wall"
-+   CXXFLAGS="-pipe -Wall"
-    AC_MSG_RESULT(release)
- fi
- 
diff --git a/print/ghostscript8/pkg-descr b/print/ghostscript8/pkg-descr
index 91c0059c2bf6..18c09162ed5f 100644
--- a/print/ghostscript8/pkg-descr
+++ b/print/ghostscript8/pkg-descr
@@ -21,4 +21,5 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://hpinkjet.sourceforge.net/
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
-WWW: http://www.cs.wisc.edu/~ghost/index.html
+
+WWW: http://www.cs.wisc.edu/~ghost/doc/AFPL/index.html