[pkgsrc/trunk]: pkgsrc/x11/xmore Fix build in some environments and some comp...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/25cb39c9e561
branches:  trunk
changeset: 557524:25cb39c9e561
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Fri Apr 17 01:07:29 2009 +0000

description:
Fix build in some environments and some compilers.  x11/libXaw provides
"xaw7", (not "xaw8") which causes xmore to deselect the printer support.  The
straggling unused static function would cause link time failure if the
compiler didn't optimise it out.

Also, don't bother to buildlink in libXprintUtil, since it currently can't be
used.

Bump PKGREVISION for yucks.

diffstat:

 x11/xmore/Makefile         |   5 ++---
 x11/xmore/distinfo         |   3 ++-
 x11/xmore/patches/patch-aa |  24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r b882bc603c06 -r 25cb39c9e561 x11/xmore/Makefile
--- a/x11/xmore/Makefile        Thu Apr 16 22:43:43 2009 +0000
+++ b/x11/xmore/Makefile        Fri Apr 17 01:07:29 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/04/17 01:07:29 dsainty Exp $
 #
 
 DISTNAME=              xmore-1.0.1
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=          .tar.bz2
@@ -19,5 +19,4 @@
 CONFIGURE_ENV+=                APP_MAN_SUFFIX=1
 
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXprintUtil/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b882bc603c06 -r 25cb39c9e561 x11/xmore/distinfo
--- a/x11/xmore/distinfo        Thu Apr 16 22:43:43 2009 +0000
+++ b/x11/xmore/distinfo        Fri Apr 17 01:07:29 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/04/10 13:47:04 joerg Exp $
+$NetBSD: distinfo,v 1.2 2009/04/17 01:07:29 dsainty Exp $
 
 SHA1 (xmore-1.0.1.tar.bz2) = abd0b926fc11c9d8c886f91b0b6a4834512cb0ba
 RMD160 (xmore-1.0.1.tar.bz2) = 98c437125fb5c7cb384bb78b536ef69d4ca363f2
 Size (xmore-1.0.1.tar.bz2) = 92060 bytes
+SHA1 (patch-aa) = 57b764a06f364898035130be8f2688e904288781
diff -r b882bc603c06 -r 25cb39c9e561 x11/xmore/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xmore/patches/patch-aa        Fri Apr 17 01:07:29 2009 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2009/04/17 01:07:30 dsainty Exp $
+
+XawPrintDialogClosePrinterConnection isn't available if USE_XPRINT isn't
+defined.
+
+--- xmore.c.orig       2009-04-16 15:00:34.037637683 +1200
++++ xmore.c    2009-04-16 15:01:03.532901704 +1200
+@@ -147,14 +147,14 @@
+     XtCallActionProc(w, "quit", NULL, NULL, 0);
+ }
+ 
++#ifdef USE_XPRINT
++
+ static void
+ printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
+ {
+     XawPrintDialogClosePrinterConnection(printdialog, False);
+ }
+ 
+-#ifdef USE_XPRINT
+-
+ static void
+ printOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
+ {