head 1.3; access; symbols pkgsrc-2013Q2:1.2.0.76 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.74 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.72 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.70 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.68 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.66 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.64 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.62 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.60 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.58 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.56 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.54 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.52 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.50 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.48 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.46 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.44 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.42 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.40 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.38 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.36 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.34 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.32 pkgsrc-2008Q1:1.2.0.30 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.28 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.26 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.24 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.22 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.20 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.18 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.16 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.3 date 2013.09.13.12.41.32; author ryoon; state dead; branches; next 1.2; commitid sKs9IWagD4Cwah5x; 1.2 date 2004.07.24.04.43.10; author grant; state Exp; branches; next 1.1; 1.1 date 98.11.05.01.34.02; author mycroft; state Exp; branches; next ; desc @@ 1.3 log @Update to 4.11.1 from 2.5.4 Changelog: * Many bugfixes and improvements. * New commands. @ text @$NetBSD: patch-ba,v 1.2 2004/07/24 04:43:10 grant Exp $ --- Makefile.in.orig 1998-09-12 23:16:32.000000000 +1000 +++ Makefile.in @@@@ -30,8 +30,8 @@@@ ETCDIR=$(ROOT)/etc # ----------------------------------------------------------------------- -SUBDIRS = popt @@MISCDIR@@ lib build tools @@PO@@ -ALLSUBDIRS = popt misc lib build tools po +SUBDIRS = @@MISCDIR@@ lib build tools @@PO@@ +ALLSUBDIRS = misc lib build tools po INSTSUBDIRS = lib scripts @@PO@@ OTHERSUBDIRS = docs autodeps OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o build.o \ @@@@ -124,21 +124,19 @@@@ install: all [ -d $(installprefix)/$(RPMCONFIGDIR) ] || \ $(mkinstalldirs) $(installprefix)/$(RPMCONFIGDIR) if [ -x ./rpm ]; then \ - $(INSTALL_PROGRAM) -s -m 755 rpm $(installprefix)/$(RPMBINDIR); \ + $(BSD_INSTALL_PROGRAM) rpm $(installprefix)/$(RPMBINDIR); \ else \ - $(INSTALL_PROGRAM) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \ + $(BSD_INSTALL_PROGRAM) rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \ fi - $(INSTALL_PROGRAM) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR) - $(INSTALL_PROGRAM) -m 755 $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs - $(INSTALL_PROGRAM) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides - $(INSTALL_PROGRAM) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires - $(INSTALL_PROGRAM) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR) - $(INSTALL_DATA) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR) - $(INSTALL_DATA) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR) - $(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc - $(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt - ln -sf $(RPMCONFIGDIR)/rpmrc $(installprefix)/$(LIBDIR)/rpmrc - ln -sf $(RPMCONFIGDIR)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt + $(BSD_INSTALL_SCRIPT) $(srcdir)/gendiff $(installprefix)/$(BINDIR) + $(BSD_INSTALL_SCRIPT) $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs + $(BSD_INSTALL_SCRIPT) $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides + $(BSD_INSTALL_SCRIPT) $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires + $(BSD_INSTALL_PROGRAM) rpm2cpio $(installprefix)/$(BINDIR) + $(BSD_INSTALL_MAN) $(srcdir)/rpm.8 $(installprefix)/$(MANDIR) + $(BSD_INSTALL_MAN) $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR) + $(BSD_INSTALL_DATA) $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc + $(BSD_INSTALL_DATA) $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt (cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) for d in $(INSTSUBDIRS); do \ (cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\ @ 1.2 log @the included popt library is broken on some platforms because it assumes alloca is available without explicitly pulling it in. use the devel/popt pkg instead and fix PKGLOCALEDIR handling while I'm here. fixes install on Solaris. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @2.5.4 @ text @d3 14 a16 3 --- Makefile.in.orig Sat Sep 12 09:16:32 1998 +++ Makefile.in Wed Nov 4 20:08:24 1998 @@@@ -124,21 +124,19 @@@@ @