[pkgsrc/trunk]: pkgsrc/print/ghostscript-esp Fix build on Solaris:

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a49a26adc03
branches:  trunk
changeset: 507585:4a49a26adc03
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Feb 04 22:12:23 2006 +0000

description:
Fix build on Solaris:
 fabsf() -> fabs()
  Solaris<=9 doesn't have fabsf()
 test -z $foo  ->  test -z "$foo"
  Solaris test objects if $foo empty.
Bump PKGREVISION for fabsf() change.

diffstat:

 print/ghostscript-esp/Makefile         |   4 +-
 print/ghostscript-esp/distinfo         |   5 ++-
 print/ghostscript-esp/patches/patch-ac |  11 ++++---
 print/ghostscript-esp/patches/patch-af |  48 ++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 9 deletions(-)

diffs (108 lines):

diff -r 11eec04fa9d5 -r 4a49a26adc03 print/ghostscript-esp/Makefile
--- a/print/ghostscript-esp/Makefile    Sat Feb 04 21:16:48 2006 +0000
+++ b/print/ghostscript-esp/Makefile    Sat Feb 04 22:12:23 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/01/24 15:28:30 ben Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/04 22:12:23 markd Exp $
 
 DISTNAME=      espgs-${GS_VERS}-source
 PKGNAME=       ghostscript-esp-${GS_VERS}
-PKGREVISION=   1
+PKGREVISION=   2
 BASEGS_VERS=   8.15
 GS_VERS=       ${BASEGS_VERS}.1
 CATEGORIES=    print
diff -r 11eec04fa9d5 -r 4a49a26adc03 print/ghostscript-esp/distinfo
--- a/print/ghostscript-esp/distinfo    Sat Feb 04 21:16:48 2006 +0000
+++ b/print/ghostscript-esp/distinfo    Sat Feb 04 22:12:23 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/11/27 17:05:29 adrianp Exp $
+$NetBSD: distinfo,v 1.10 2006/02/04 22:12:23 markd Exp $
 
 SHA1 (ghostscript/espgs-8.15.1-source.tar.bz2) = 55e51f6dcaa9c645ea500fa849b92a18dcabfd90
 RMD160 (ghostscript/espgs-8.15.1-source.tar.bz2) = 8c03b9304d098cea7cb1ce0f056820d048b91423
@@ -8,6 +8,7 @@
 Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
 SHA1 (patch-aa) = acc927ec55f3b45196a6bcc76048ddef21e3a236
 SHA1 (patch-ab) = 6ad4a094820b1e4e5b67abc77412c76d54661552
-SHA1 (patch-ac) = 8b525bbc73369721ef52d6789c36693e98576013
+SHA1 (patch-ac) = 46c026901747c62e345d9058e54b983755f7a800
 SHA1 (patch-ad) = 2a8dc901edf104a9d2cc25216d99ab12c3fd7d67
 SHA1 (patch-ae) = 964023e6d5e94f7cd471a9e7c5b29c4ce7db715e
+SHA1 (patch-af) = 3e4172be5b7bedaec45a696276be8048626f73f2
diff -r 11eec04fa9d5 -r 4a49a26adc03 print/ghostscript-esp/patches/patch-ac
--- a/print/ghostscript-esp/patches/patch-ac    Sat Feb 04 21:16:48 2006 +0000
+++ b/print/ghostscript-esp/patches/patch-ac    Sat Feb 04 22:12:23 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2005/11/21 06:17:58 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2006/02/04 22:12:23 markd Exp $
 
---- src/unixinst.mak.orig      2005-09-22 13:03:45.000000000 -0400
+--- src/unixinst.mak.orig      2005-09-23 05:03:45.000000000 +1200
 +++ src/unixinst.mak
 @@ -147,7 +147,7 @@ install-man: $(PSMANDIR)/gs.1
                          ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
@@ -16,7 +16,8 @@
  
  install-shared: $(GS_SHARED_OBJS)
 -      -mkdir -p $(gssharedir)
+       $(SH) -c 'echo $(GS_SHARED_OBJS) | while read obj ; do \
+-          test -z $$obj || $(INSTALL_PROGRAM) $$obj $(gssharedir)/; done'
++          test -z "$$obj" || mkdir -p $(gssharedir); break; done'
 +      $(SH) -c 'echo $(GS_SHARED_OBJS) | while read obj ; do \
-+          test -z $$obj || mkdir -p $(gssharedir); break; done'
-       $(SH) -c 'echo $(GS_SHARED_OBJS) | while read obj ; do \
-           test -z $$obj || $(INSTALL_PROGRAM) $$obj $(gssharedir)/; done'
++          test -z "$$obj" || $(INSTALL_PROGRAM) $$obj $(gssharedir)/; done'
diff -r 11eec04fa9d5 -r 4a49a26adc03 print/ghostscript-esp/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/ghostscript-esp/patches/patch-af    Sat Feb 04 22:12:23 2006 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-af,v 1.1 2006/02/04 22:12:23 markd Exp $
+
+--- addons/opvp/gdevopvp.c.orig        2005-09-23 05:06:31.000000000 +1200
++++ addons/opvp/gdevopvp.c
+@@ -752,7 +752,7 @@ opvp_get_papertable_index(
+                               paper = i;
+                               match = true;
+                               break;
+-                      } else if ((f = fabsf(height - paper_h)) < TOLERANCE) {
++                      } else if ((f = fabs(height - paper_h)) < TOLERANCE) {
+                               if (f < h_delta) {
+                                       h_delta = f;
+                                       candidate = i;
+@@ -765,14 +765,14 @@ opvp_get_papertable_index(
+               } else if (prev != paper_w) {
+                       prev = paper_w;
+                       if (paper_w < width) {
+-                              if ((f = fabsf(width - paper_w)) < TOLERANCE) {
++                              if ((f = fabs(width - paper_w)) < TOLERANCE) {
+                                       if (f < sw_delta) {
+                                               sw_delta = f;
+                                               smaller  = i;
+                                       }
+                               }
+                       } else {
+-                              if ((f = fabsf(width - paper_w)) < TOLERANCE) {
++                              if ((f = fabs(width - paper_w)) < TOLERANCE) {
+                                       if (f < lw_delta) {
+                                               lw_delta = f;
+                                               larger   = i;
+@@ -791,7 +791,7 @@ opvp_get_papertable_index(
+                                       sh_delta = 0;
+                                       s_candi  = i;
+                                       break;
+-                              } else if ((f = fabsf(height - paper_h))
++                              } else if ((f = fabs(height - paper_h))
+                                          < TOLERANCE) {
+                                       if (f < sh_delta) {
+                                               sh_delta = f;
+@@ -808,7 +808,7 @@ opvp_get_papertable_index(
+                                       lh_delta = 0;
+                                       l_candi  = i;
+                                       break;
+-                              } else if ((f = fabsf(height - paper_h))
++                              } else if ((f = fabs(height - paper_h))
+                                          < TOLERANCE) {
+                                       if (f < lh_delta) {
+                                               lh_delta = f;