summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/pdmenu/Makefile32
-rw-r--r--misc/pdmenu/PLIST3
-rw-r--r--misc/pdmenu/distinfo4
-rw-r--r--misc/pdmenu/patches/patch-aa11
4 files changed, 31 insertions, 19 deletions
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 3fdd073ef7c..955b653ff60 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:25 jlam Exp $
-# FreeBSD Id: ports/misc/pdmenu/Makefile,v 1.11 2001/01/16 17:31:42 sobomax Exp
+# $NetBSD: Makefile,v 1.9 2002/01/01 17:36:28 wiz Exp $
+#
DISTNAME= ${PKGNAME:S|-|_|}
PKGNAME= pdmenu-1.2.65
@@ -10,32 +10,36 @@ MAINTAINER= zuntum@netbsd.org
HOMEPAGE= http://www.kitenet.net/programs/pdmenu/
COMMENT= Simple console menu program
-DEPENDS+= libslang-[0-9]*:../../devel/libslang
-
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_PERL5= YES
WRKSRC= ${WRKDIR}/pdmenu
-CONFIGURE_ENV= SLANG_LIB_LOC="${LOCALBASE}/lib" \
- SLANG_H_LOC="${LOCALBASE}/include/slang.h"
+REPLACE_PERL= examples/showdir.pl
+
+USE_BUILDLINK_ONLY= YES
-MAKE_ENV+= LIBS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV= SLANG_LIB_LOC="${BUILDLINK_DIR}/lib" \
+ SLANG_H_LOC="${BUILDLINK_DIR}/include/slang.h"
pre-install:
- ${SED} "s,.B /etc/pdmenurc,.B ${PREFIX}/etc/pdmenurc,g" \
+ ${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 \
+ ${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 \
+ cd ${WRKSRC}/doc && ${INSTALL_DATA} ANNOUNCE BUGS TODO \
${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
+ 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 "../../devel/libslang/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/pdmenu/PLIST b/misc/pdmenu/PLIST
index a91b0cfd0d5..bbefd00f3c9 100644
--- a/misc/pdmenu/PLIST
+++ b/misc/pdmenu/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/01 17:36:28 wiz Exp $
bin/pdmenu
lib/pdmenu/editdir.pl
lib/pdmenu/showdir.pl
man/man1/pdmenu.1
man/man5/pdmenurc.5
-share/doc/pdmenu/${PKGNAME}.lsm
share/doc/pdmenu/ANNOUNCE
share/doc/pdmenu/BUGS
share/doc/pdmenu/TODO
diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo
index 11475b2c914..f0264ad9437 100644
--- a/misc/pdmenu/distinfo
+++ b/misc/pdmenu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/04/28 12:44:57 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2002/01/01 17:36:28 wiz Exp $
SHA1 (pdmenu_1.2.65.tar.gz) = d25a7cc5f0c316cbfdcd84ec22a1766ee8c50272
Size (pdmenu_1.2.65.tar.gz) = 88453 bytes
-SHA1 (patch-aa) = 1b7027a0505e2f6eb605113f2e87ca7cac9c037e
+SHA1 (patch-aa) = e8d10f390785e1971e13b515e8d71c747353a0cc
diff --git a/misc/pdmenu/patches/patch-aa b/misc/pdmenu/patches/patch-aa
index 728c7357bd0..3d9f943c636 100644
--- a/misc/pdmenu/patches/patch-aa
+++ b/misc/pdmenu/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2001/04/28 12:44:58 zuntum Exp $
+$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 @@
+
+ all: pdmenu
+ pdmenu: .dep $(OBJFILES)
+- ${CC} -o pdmenu $(OBJFILES) $(CFLAGS) $(LIBS)
++ ${CC} -o pdmenu -Wl,-R${LOCALBASE}/lib $(OBJFILES) $(CFLAGS) $(LIBS)
+
+
+ depend: .dep
@@ -68,11 +68,6 @@
$(INSTALL) -s pdmenu $(INSTALL_PREFIX)/$(BINDIR)
$(INSTALL) doc/pdmenu.man $(INSTALL_PREFIX)/$(MANDIR)/man1/pdmenu.1 -m 0644