[pkgsrc/trunk]: pkgsrc/misc/pdmenu Fix build and install on Solaris. From Jon...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7edbe68734d8
branches:  trunk
changeset: 461822:7edbe68734d8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Sep 22 09:32:20 2003 +0000

description:
Fix build and install on Solaris. From Jonathan Perkin in PR 22883.

diffstat:

 misc/pdmenu/Makefile         |   8 ++++----
 misc/pdmenu/distinfo         |   4 ++--
 misc/pdmenu/patches/patch-aa |  25 ++++++++++++++-----------
 3 files changed, 20 insertions(+), 17 deletions(-)

diffs (67 lines):

diff -r 4adaeeb5271b -r 7edbe68734d8 misc/pdmenu/Makefile
--- a/misc/pdmenu/Makefile      Mon Sep 22 09:30:03 2003 +0000
+++ b/misc/pdmenu/Makefile      Mon Sep 22 09:32:20 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:49:45 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/22 09:32:20 wiz Exp $
 #
 
 DISTNAME=      pdmenu_1.2.65
@@ -30,9 +30,9 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/pdmenu
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pdmenu \
-               ${PREFIX}/share/examples/pdmenu \
-               ${PREFIX}/share/examples/pdmenu/newbie
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pdmenu
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pdmenu
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pdmenu/newbie
        cd ${WRKSRC}/doc && ${INSTALL_DATA} ANNOUNCE BUGS TODO \
                ${PREFIX}/share/doc/pdmenu
        cd ${WRKSRC}/examples && ${INSTALL_DATA} README ba.lpd pdmenurc \
diff -r 4adaeeb5271b -r 7edbe68734d8 misc/pdmenu/distinfo
--- a/misc/pdmenu/distinfo      Mon Sep 22 09:30:03 2003 +0000
+++ b/misc/pdmenu/distinfo      Mon Sep 22 09:32:20 2003 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/01/01 17:36:28 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/09/22 09:32:20 wiz Exp $
 
 SHA1 (pdmenu_1.2.65.tar.gz) = d25a7cc5f0c316cbfdcd84ec22a1766ee8c50272
 Size (pdmenu_1.2.65.tar.gz) = 88453 bytes
-SHA1 (patch-aa) = e8d10f390785e1971e13b515e8d71c747353a0cc
+SHA1 (patch-aa) = b5d2d0620e466ab2b13a530b0611e15d517b452d
diff -r 4adaeeb5271b -r 7edbe68734d8 misc/pdmenu/patches/patch-aa
--- a/misc/pdmenu/patches/patch-aa      Mon Sep 22 09:30:03 2003 +0000
+++ b/misc/pdmenu/patches/patch-aa      Mon Sep 22 09:32:20 2003 +0000
@@ -1,16 +1,19 @@
-$NetBSD: patch-aa,v 1.4 2002/01/01 17:36:29 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2003/09/22 09:32:21 wiz Exp $
 
---- autoconf/makeinfo.in.orig  Sat Aug 28 05:27:37 1999
-+++ autoconf/makeinfo.in
-@@ -33,7 +33,7 @@
+--- autoconf/makeinfo.in.orig  Sat Aug 28 04:27:37 1999
++++ autoconf/makeinfo.in       Mon Sep 22 10:14:07 2003
+@@ -16,9 +16,9 @@
+ VER           = @VER@
+ DEFINES               = -DETCDIR=\"${SYSCONFDIR}/\" -DVER=\"${VER}\" @DEFS@ \
+                 $(PROFILE) -D__USE_FIXED_PROTOTYPES__ -D_GNU_SOURCE
+-CFLAGS_FOR_GCC        = -Wall -fstrict-prototypes
++#CFLAGS_FOR_GCC       = -Wall -fstrict-prototypes
+ CFLAGS                = $(DEFINES) @gcc_cflags@ @CFLAGS@
+-LIBS          = @LIBS@ $(EFENCE)
++LIBS          = @LIBS@ $(EFENCE) @LDFLAGS@
+ SRCDIR                = src
  
- all: pdmenu
- pdmenu: .dep $(OBJFILES)
--      ${CC} -o pdmenu $(OBJFILES) $(CFLAGS) $(LIBS)
-+      ${CC} -o pdmenu -Wl,-R${LOCALBASE}/lib $(OBJFILES) $(CFLAGS) $(LIBS)
- 
- 
- depend: .dep
+ #------------------- end user configurable section ------------------------#
 @@ -68,11 +68,6 @@
        $(INSTALL) -s pdmenu $(INSTALL_PREFIX)/$(BINDIR)
        $(INSTALL) doc/pdmenu.man $(INSTALL_PREFIX)/$(MANDIR)/man1/pdmenu.1 -m 0644