>Number:         22883
>Category:       pkg
>Synopsis:       Fix a couple of bugs in misc/pdmenu
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 22 09:25:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        N/A
>Organization:
British Broadcasting Corporation
>Environment:
SunOS build1 5.9 Generic_112233-01 sun4u sparc SUNW,UltraSPARC-IIi-cEngine
>Description:
1) "cc1: error: unrecognized option `-fstrict-prototypes'".  This one is
   rather self-explanatory.  Remove it completely to aid non-gcc builds
   rather than fix it.
2) ${INSTALL} for SunOS is /usr/ucb/install, which cannot handle more
   than one directory at a time.
3) patch-aa hardcodes the gcc-specific rpath stuff, make sure we use
   ${LDFLAGS} instead.
>How-To-Repeat:
1) cc1: error: unrecognized option `-fstrict-prototypes'
   gmake: *** [src/pdmenu.o] Error 1
   *** Error code 2

2) /usr/ucb/install -d -o jonp -g inetops -m 02755 /home/jonp/bulk/pkg/share/doc/pdmenu /home/jonp/bulk/pkg/share/examples/pdmenu /home/jonp/bulk/pkg/share/examples/pdmenu/newbie
   usage: install [-cs] [-g group] [-m mode] [-o owner] file ... destination
          install  -d   [-g group] [-m mode] [-o owner] dir
   *** Error code 1
>Fix:
http://www.perkin.org.uk/projects/netbsd/pdmenu.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/pdmenu/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2003/07/17 21:49:45	1.14
+++ Makefile	2003/09/22 09:22:35
@@ -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 \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/misc/pdmenu/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	2002/01/01 17:36:28	1.4
+++ distinfo	2003/09/22 09:22:35
@@ -2,4 +2,4 @@
 
 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
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/misc/pdmenu/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa	2002/01/01 17:36:29	1.4
+++ patches/patch-aa	2003/09/22 09:22:35
@@ -1,16 +1,19 @@
 $NetBSD: patch-aa,v 1.4 2002/01/01 17:36:29 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
>Release-Note:
>Audit-Trail:
>Unformatted: