o don't install ${PREFIX}/etc/pdmenurc, ${PREFIX}/share/examples/pdmenu/pdmenurc

  is enough. from latest bulk build leftovers.
o rework quoting & tabs

3 files changed, 34 insertions, 17 deletions

diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 760d4b20760..8b85e765809 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/16 20:53:04 zuntum Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/28 12:44:57 zuntum Exp $
 # FreeBSD Id: ports/misc/pdmenu/Makefile,v 1.11 2001/01/16 17:31:42 sobomax Exp
 
 DISTNAME=	${PKGNAME:S|-|_|}
@@ -17,25 +17,25 @@ USE_GMAKE=	YES
 USE_PERL5=	YES
 WRKSRC=		${WRKDIR}/pdmenu
 
-CONFIGURE_ENV=	SLANG_LIB_LOC='${LOCALBASE}/lib'						\
-		SLANG_H_LOC='${LOCALBASE}/include/slang.h'
+CONFIGURE_ENV=	SLANG_LIB_LOC="${LOCALBASE}/lib"					\
+		SLANG_H_LOC="${LOCALBASE}/include/slang.h"
 
-MAKE_ENV+=	"LIBS=-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
+MAKE_ENV+=	LIBS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
 
 pre-install:
-		${SED} "s,.B /etc/pdmenurc,.B ${PREFIX}/etc/pdmenurc,g"				\
-			${WRKSRC}/doc/pdmenurc.man > ${WRKSRC}/doc/pdmenurc.man.done
-		${MV} ${WRKSRC}/doc/pdmenurc.man.done ${WRKSRC}/doc/pdmenurc.man
-		${INSTALL_DATA_DIR} ${PREFIX}/lib/pdmenu
+	${SED} "s,.B /etc/pdmenurc,.B ${PREFIX}/etc/pdmenurc,g"				\
+		${WRKSRC}/doc/pdmenurc.man > ${WRKSRC}/doc/pdmenurc.man.done
+	${MV} ${WRKSRC}/doc/pdmenurc.man.done ${WRKSRC}/doc/pdmenurc.man
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/pdmenu
 
 post-install:
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pdmenu ${PREFIX}/share/examples/pdmenu	\
-			${PREFIX}/share/examples/pdmenu/newbie
-		cd ${WRKSRC}/doc && ${INSTALL_DATA} ANNOUNCE BUGS TODO pdmenu-1.2.65.lsm 	\
-			${PREFIX}/share/doc/pdmenu
-		cd ${WRKSRC}/examples && ${INSTALL_DATA} README ba.lpd pdmenurc pdmenurc.complex\
-			pdmenurc.monitor showdir.pl ${PREFIX}/share/examples/pdmenu
-		cd ${WRKSRC}/examples/newbie && ${INSTALL_DATA} modem-check pdmenurc.newbie	\
-			rpm-info-on-command ${PREFIX}/share/examples/pdmenu/newbie
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pdmenu ${PREFIX}/share/examples/pdmenu	\
+		${PREFIX}/share/examples/pdmenu/newbie
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ANNOUNCE BUGS TODO pdmenu-1.2.65.lsm 	\
+		${PREFIX}/share/doc/pdmenu
+	cd ${WRKSRC}/examples && ${INSTALL_DATA} README ba.lpd pdmenurc pdmenurc.complex\
+		pdmenurc.monitor showdir.pl ${PREFIX}/share/examples/pdmenu
+	cd ${WRKSRC}/examples/newbie && ${INSTALL_DATA} modem-check pdmenurc.newbie	\
+		rpm-info-on-command ${PREFIX}/share/examples/pdmenu/newbie
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo
index 8eb2a475097..11475b2c914 100644
--- a/misc/pdmenu/distinfo
+++ b/misc/pdmenu/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/28 12:44:57 zuntum Exp $
 
 SHA1 (pdmenu_1.2.65.tar.gz) = d25a7cc5f0c316cbfdcd84ec22a1766ee8c50272
 Size (pdmenu_1.2.65.tar.gz) = 88453 bytes
+SHA1 (patch-aa) = 1b7027a0505e2f6eb605113f2e87ca7cac9c037e
diff --git a/misc/pdmenu/patches/patch-aa b/misc/pdmenu/patches/patch-aa
new file mode 100644
index 00000000000..728c7357bd0
--- /dev/null
+++ b/misc/pdmenu/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.3 2001/04/28 12:44:58 zuntum Exp $
+
+--- autoconf/makeinfo.in.orig	Sat Aug 28 05:27:37 1999
++++ autoconf/makeinfo.in
+@@ -68,11 +68,6 @@
+ 	$(INSTALL) -s pdmenu $(INSTALL_PREFIX)/$(BINDIR)
+ 	$(INSTALL) doc/pdmenu.man $(INSTALL_PREFIX)/$(MANDIR)/man1/pdmenu.1 -m 0644
+ 	$(INSTALL) doc/pdmenurc.man $(INSTALL_PREFIX)/$(MANDIR)/man5/pdmenurc.5 -m 0644
+-	if [ -e $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc ]; then \
+-		echo "Backing up $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc to $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc.old .." ; \
+-		cp $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc.old ; \
+-	fi
+-	$(INSTALL) examples/pdmenurc $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc -m 0644
+ 	$(INSTALL) examples/showdir.pl $(INSTALL_PREFIX)/$(LIBDIR)
+ 	cd $(INSTALL_PREFIX)/$(LIBDIR) && $(LN_S) -f showdir.pl editdir.pl
+