summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2001-02-21 02:34:58 +0000
committerhubertf <hubertf@pkgsrc.org>2001-02-21 02:34:58 +0000
commit0e6438cb4ec89e9e84b707df13c90d253cfb36ea (patch)
tree9e51e1fdcdea5bcc8e8bdf65ad3006cb21082b50 /misc
parentd210267b93275ae0bd64778f03735cf30579c8f9 (diff)
downloadpkgsrc-0e6438cb4ec89e9e84b707df13c90d253cfb36ea.tar.gz
* no functional changes, only some fixes for the Makefile
(pass -Wl,-R via MAKE_ENV instead of the patch etc) Patch sent by Tomasz Luchowski <zuntum@eik.pl> in private mail.
Diffstat (limited to 'misc')
-rw-r--r--misc/pdmenu/Makefile28
-rw-r--r--misc/pdmenu/files/md52
-rw-r--r--misc/pdmenu/patches/patch-aa26
-rw-r--r--misc/pdmenu/pkg/PLIST3
4 files changed, 15 insertions, 44 deletions
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 6c40a592837..b0cce942198 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/21 02:34:58 hubertf Exp $
# FreeBSD Id: ports/misc/pdmenu/Makefile,v 1.11 2001/01/16 17:31:42 sobomax Exp
DISTNAME= ${PKGNAME:S|-|_|}
@@ -17,27 +17,25 @@ USE_GMAKE= YES
USE_PERL5= YES
WRKSRC= ${WRKDIR}/pdmenu
-CONFIGURE_ENV= SLANG_LIB_LOC='${LOCALBASE}/lib' \
+CONFIGURE_ENV= SLANG_LIB_LOC='${LOCALBASE}/lib' \
SLANG_H_LOC='${LOCALBASE}/include/slang.h'
-post-patch:
- ${SED} "s,@LOCALBASE@,${LOCALBASE},g" \
- < ${WRKSRC}/autoconf/makeinfo.in > ${WRKSRC}/autoconf/makeinfo.in.done
- ${MV} ${WRKSRC}/autoconf/makeinfo.in.done ${WRKSRC}/autoconf/makeinfo.in
+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
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} -c -o root -g wheel ANNOUNCE BUGS TODO \
- pdmenu-1.2.65.lsm ${PREFIX}/share/doc/pdmenu
- cd ${WRKSRC}/examples && ${INSTALL} -c -o root -g wheel README ba.lpd \
- pdmenurc pdmenurc.complex pdmenurc.monitor showdir.pl \
- ${PREFIX}/share/examples/pdmenu
- cd ${WRKSRC}/examples/newbie && ${INSTALL} -c -o root -g wheel \
- modem-check pdmenurc.newbie rpm-info-on-command \
- ${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/files/md5 b/misc/pdmenu/files/md5
index e4af6bf3846..1376d64c782 100644
--- a/misc/pdmenu/files/md5
+++ b/misc/pdmenu/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/01/18 01:50:46 hubertf Exp $
+$NetBSD: md5,v 1.2 2001/02/21 02:34:58 hubertf Exp $
MD5 (pdmenu_1.2.65.tar.gz) = a48c6bd9de312eb91a4a6715c100e71e
diff --git a/misc/pdmenu/patches/patch-aa b/misc/pdmenu/patches/patch-aa
deleted file mode 100644
index 6f30c450239..00000000000
--- a/misc/pdmenu/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/18 01:50:46 hubertf Exp $
-
---- autoconf/makeinfo.in.orig Sat Aug 28 05:27:37 1999
-+++ autoconf/makeinfo.in
-@@ -18,7 +18,7 @@
- $(PROFILE) -D__USE_FIXED_PROTOTYPES__ -D_GNU_SOURCE
- CFLAGS_FOR_GCC = -Wall -fstrict-prototypes
- CFLAGS = $(DEFINES) @gcc_cflags@ @CFLAGS@
--LIBS = @LIBS@ $(EFENCE)
-+LIBS = @LIBS@ -Wl,-R/usr/pkg/lib -L/usr/pkg/lib $(EFENCE)
- SRCDIR = src
-
- #------------------- end user configurable section ------------------------#
-@@ -68,11 +68,7 @@
- $(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/pdmenurc $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc.sample -m 0644
- $(INSTALL) examples/showdir.pl $(INSTALL_PREFIX)/$(LIBDIR)
- cd $(INSTALL_PREFIX)/$(LIBDIR) && $(LN_S) -f showdir.pl editdir.pl
-
diff --git a/misc/pdmenu/pkg/PLIST b/misc/pdmenu/pkg/PLIST
index d1add640978..72ec65705c8 100644
--- a/misc/pdmenu/pkg/PLIST
+++ b/misc/pdmenu/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/18 01:50:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/21 02:34:59 hubertf Exp $
bin/pdmenu
-etc/pdmenurc.sample
lib/pdmenu/editdir.pl
lib/pdmenu/showdir.pl
man/man1/pdmenu.1