From owner-freebsd-ports Tue Nov 9 10:20:28 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 6786D152EF for ; Tue, 9 Nov 1999 10:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA40663; Tue, 9 Nov 1999 10:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B4B14BC2; Tue, 9 Nov 1999 10:17:18 -0800 (PST) Message-Id: <19991109181718.20B4B14BC2@hub.freebsd.org> Date: Tue, 9 Nov 1999 10:17:18 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/14803: Update port: misc/rpm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14803 >Category: ports >Synopsis: Update port: misc/rpm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Nov 9 10:20:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE >Organization: >Environment: >Description: * Removed (unnecessary) dependancy on GNU gettext * Modified install path of configuration files from lib/ to etc/ * Fixed some files to set file permission properly New file: patches/patch-al patches/patch-am patches/patch-an patches/patch-ao patches/patch-ap patches/patch-aq patches/patch-ar patches/patch-as patches/patch-at Note: PRs of ports/14769 and ports/14796 would be closed with this update. >How-To-Repeat: >Fix: diff -urN /usr/ports/misc/rpm/Makefile misc/rpm/Makefile --- /usr/ports/misc/rpm/Makefile Mon Nov 1 21:16:29 1999 +++ misc/rpm/Makefile Tue Nov 9 04:17:44 1999 @@ -14,13 +14,13 @@ BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm -GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}" -CONFIGURE_ARGS= --disable-nls USE_GMAKE= yes +USE_AUTOCONF= yes +CONFIGURE_ARGS= --disable-nls + MAN8= rpm.8 rpm2cpio.8 -pre-install: - ${MKDIR} ${PREFIX}/include/rpm +pre-configure: + @(cd ${WRKSRC}/popt && ${AUTOCONF}) .include diff -urN /usr/ports/misc/rpm/patches/patch-ac misc/rpm/patches/patch-ac --- /usr/ports/misc/rpm/patches/patch-ac Mon May 3 21:53:44 1999 +++ misc/rpm/patches/patch-ac Tue Nov 9 00:42:18 1999 @@ -1,10 +1,13 @@ ---- build/parseScript.c.orig Mon Sep 28 04:16:53 1998 -+++ build/parseScript.c Thu Apr 29 23:51:25 1999 -@@ -1,6 +1,5 @@ +--- build/parseScript.c.orig Mon Sep 28 05:16:53 1998 ++++ build/parseScript.c Tue Nov 9 00:40:28 1999 +@@ -1,6 +1,9 @@ #include "config.h" -#include ++#ifndef __STDC__ ++# include ++#endif ++ #include #include "intl.h" - diff -urN /usr/ports/misc/rpm/patches/patch-ad misc/rpm/patches/patch-ad --- /usr/ports/misc/rpm/patches/patch-ad Mon May 3 21:53:44 1999 +++ misc/rpm/patches/patch-ad Tue Nov 9 00:42:27 1999 @@ -1,13 +1,15 @@ -*** build/spec.c.old Thu Feb 11 23:46:23 1999 ---- build/spec.c Thu Feb 11 23:46:58 1999 -*************** -*** 1,7 **** - #include "config.h" - - #include -- #include - #include - - #include "files.h" ---- 1,6 ---- +--- build/spec.c.orig Thu Oct 22 01:05:41 1998 ++++ build/spec.c Tue Nov 9 00:41:35 1999 +@@ -1,7 +1,11 @@ + #include "config.h" + #include +-#include ++ ++#ifndef __STDC__ ++# include ++#endif ++ + #include + + #include "files.h" diff -urN /usr/ports/misc/rpm/patches/patch-al misc/rpm/patches/patch-al --- /usr/ports/misc/rpm/patches/patch-al Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-al Tue Nov 9 03:56:05 1999 @@ -0,0 +1,55 @@ +--- Makefile.in.orig Sat Oct 10 08:28:05 1998 ++++ Makefile.in Tue Nov 9 03:55:51 1999 +@@ -7,6 +7,7 @@ + + INSTALL= @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + #LIBEFENCE = -lefence + +@@ -26,7 +27,7 @@ + MANDIR=$(prefix)/man/man8 + LIBDIR=$(libdir) + INCDIR=$(prefix)/include/rpm +-ETCDIR=$(ROOT)/etc ++ETCDIR=$(prefix)/etc + + # ----------------------------------------------------------------------- + +@@ -122,22 +123,21 @@ + [ -d $(installprefix)/$(RPMCONFIGDIR) ] || \ + $(mkinstalldirs) $(installprefix)/$(RPMCONFIGDIR) + if [ -x ./rpm ]; then \ +- $(INSTALL_PROGRAM) -s -m 755 rpm $(installprefix)/$(RPMBINDIR); \ ++ $(INSTALL_PROGRAM) rpm $(installprefix)/$(RPMBINDIR); \ + else \ +- $(INSTALL_PROGRAM) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \ ++ $(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 +- (cd $(installprefix)/$(LIBDIR); rm -f rpmrc; ln -s $(RPMCONFIGDIR)/rpmrc rpmrc) +- (cd $(installprefix)/$(LIBDIR); rm -f rpmpopt; ln -s $(RPMCONFIGDIR)/rpmpopt rpmpopt) +- (cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ++ $(INSTALL_SCRIPT) $(srcdir)/gendiff $(installprefix)/$(BINDIR) ++ $(INSTALL_SCRIPT) $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs ++ $(INSTALL_SCRIPT) $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides ++ $(INSTALL_SCRIPT) $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires ++ $(INSTALL_PROGRAM) rpm2cpio $(installprefix)/$(BINDIR) ++ $(INSTALL_DATA) $(srcdir)/rpm.8 $(installprefix)/$(MANDIR) ++ $(INSTALL_DATA) $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR) ++ $(INSTALL_DATA) $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc ++ $(INSTALL_DATA) $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt ++ (cd $(installprefix)/$(ETCDIR); rm -f rpmrc; ln -s $(RPMCONFIGDIR)/rpmrc rpmrc) ++ (cd $(installprefix)/$(ETCDIR); rm -f rpmpopt; ln -s $(RPMCONFIGDIR)/rpmpopt rpmpopt) + for d in $(INSTSUBDIRS); do \ + (cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\ + done diff -urN /usr/ports/misc/rpm/patches/patch-am misc/rpm/patches/patch-am --- /usr/ports/misc/rpm/patches/patch-am Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-am Tue Nov 9 02:17:40 1999 @@ -0,0 +1,11 @@ +--- configure.in.orig Fri Dec 18 01:36:57 1998 ++++ configure.in Tue Nov 9 01:03:24 1999 +@@ -17,7 +17,7 @@ + + AC_CANONICAL_SYSTEM + +-RPMCONFIGDIR='$(libdir)/rpm' ++RPMCONFIGDIR='$(prefix)/etc/rpm' + + dnl Checks for programs. + AC_PROG_CC diff -urN /usr/ports/misc/rpm/patches/patch-an misc/rpm/patches/patch-an --- /usr/ports/misc/rpm/patches/patch-an Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-an Tue Nov 9 00:27:23 1999 @@ -0,0 +1,8 @@ +--- rpm-qo.c.orig Tue Sep 29 04:30:21 1998 ++++ rpm-qo.c Tue Nov 9 00:27:14 1999 +@@ -1,4 +1,4 @@ +-#include ++/* #include */ + #include + #include + #include diff -urN /usr/ports/misc/rpm/patches/patch-ao misc/rpm/patches/patch-ao --- /usr/ports/misc/rpm/patches/patch-ao Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-ao Tue Nov 9 00:24:42 1999 @@ -0,0 +1,15 @@ +--- build/files.c.orig Thu Nov 26 00:29:52 1998 ++++ build/files.c Tue Nov 9 00:22:34 1999 +@@ -8,7 +8,11 @@ + #endif + + #include +-#include ++ ++#ifndef __STDC__ ++# include ++#endif ++ + #include + #include + #include diff -urN /usr/ports/misc/rpm/patches/patch-ap misc/rpm/patches/patch-ap --- /usr/ports/misc/rpm/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-ap Tue Nov 9 00:24:05 1999 @@ -0,0 +1,15 @@ +--- build/pack.c.orig Sun Dec 6 08:02:48 1998 ++++ build/pack.c Tue Nov 9 00:23:51 1999 +@@ -4,7 +4,11 @@ + #include + #include + #include +-#include ++ ++#ifndef __STDC__ ++# include ++#endif ++ + #include + #include + #include diff -urN /usr/ports/misc/rpm/patches/patch-aq misc/rpm/patches/patch-aq --- /usr/ports/misc/rpm/patches/patch-aq Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-aq Tue Nov 9 03:46:39 1999 @@ -0,0 +1,25 @@ +--- lib/Makefile.in.orig Wed Aug 12 01:09:18 1998 ++++ lib/Makefile.in Tue Nov 9 03:46:22 1999 +@@ -19,6 +19,7 @@ + PROGS = + INSTALL= @INSTALL@ + INSTALL_PROGRAM= @INSTALL_PROGRAM@ ++INSTALL_SCRIPT= @INSTALL_SCRIPT@ + INSTALL_DATA= @INSTALL_DATA@ + + # ----------------------------------------------------------------------- +@@ -55,10 +56,10 @@ + echo 'const int rpmTagTableSize = sizeof(rpmTagTable) / sizeof(struct headerTagTableEntry) - 1;' >> tagtable.c + + install: +- $(INSTALL_DATA) -m 644 $(srcdir)/rpmlib.h $(INCDIR) +- $(INSTALL_DATA) -m 644 $(srcdir)/dbindex.h $(INCDIR) +- $(INSTALL_DATA) -m 644 $(srcdir)/header.h $(INCDIR) +- $(INSTALL_DATA) -m 644 librpm.a $(LIBDIR) ++ $(INSTALL_DATA) $(srcdir)/rpmlib.h $(INCDIR) ++ $(INSTALL_DATA) $(srcdir)/dbindex.h $(INCDIR) ++ $(INSTALL_DATA) $(srcdir)/header.h $(INCDIR) ++ $(INSTALL_DATA) librpm.a $(LIBDIR) + + distclean: clean + rm -f Makefile diff -urN /usr/ports/misc/rpm/patches/patch-ar misc/rpm/patches/patch-ar --- /usr/ports/misc/rpm/patches/patch-ar Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-ar Tue Nov 9 01:48:11 1999 @@ -0,0 +1,58 @@ +--- popt/Makefile.in.orig Tue Dec 22 03:30:11 1998 ++++ popt/Makefile.in Tue Nov 9 01:47:51 1999 +@@ -70,7 +70,7 @@ + + AUTOMAKE_OPTIONS = 1.3 foreign + +-SUBDIRS = po ++SUBDIRS = @PO@ + + LDFLAGS = -L$(top_builddir) + INCLUDES = -I$(top_srcdir) +@@ -130,20 +130,21 @@ + + .SUFFIXES: + .SUFFIXES: .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile ++# these rules should be in here, but they drive me batty ++#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ #cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +- cd $(top_builddir) \ ++#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ++ #cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +-$(ACLOCAL_M4): configure.in +- cd $(srcdir) && $(ACLOCAL) ++#$(ACLOCAL_M4): configure.in ++ #cd $(srcdir) && $(ACLOCAL) + +-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- $(SHELL) ./config.status --recheck +-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +- cd $(srcdir) && $(AUTOCONF) ++#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ #$(SHELL) ./config.status --recheck ++#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++ #cd $(srcdir) && $(AUTOCONF) + + config.h: stamp-h + @: +@@ -152,10 +153,10 @@ + && CONFIG_FILES= CONFIG_HEADERS=config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h +-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in +-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +- cd $(top_srcdir) && $(AUTOHEADER) +- @echo timestamp > $(srcdir)/stamp-h.in ++#$(srcdir)/config.h.in: $(srcdir)/stamp-h.in ++#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h ++ #cd $(top_srcdir) && $(AUTOHEADER) ++ #@echo timestamp > $(srcdir)/stamp-h.in + + mostlyclean-hdr: + diff -urN /usr/ports/misc/rpm/patches/patch-as misc/rpm/patches/patch-as --- /usr/ports/misc/rpm/patches/patch-as Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-as Tue Nov 9 01:57:55 1999 @@ -0,0 +1,74 @@ +--- popt/configure.in.orig Fri Dec 11 03:37:23 1998 ++++ popt/configure.in Tue Nov 9 01:57:42 1999 +@@ -2,6 +2,11 @@ + AM_INIT_AUTOMAKE(popt, 1.2.2) + AM_CONFIG_HEADER(config.h) + ++dnl default to not using NLS ++XGETTEXT="" ++LIBINTL="" ++PO="" ++ + AC_PROG_CC + AC_GCC_TRADITIONAL + AM_C_PROTOTYPES +@@ -38,7 +43,7 @@ + fi + AC_SUBST(TARGET) + +-AC_CHECK_HEADERS(unistd.h alloca.h libintl.h) ++AC_CHECK_HEADERS(unistd.h alloca.h) + AC_MSG_CHECKING(for /usr/ucblib in LIBS) + if test -d /usr/ucblib ; then + if test "$build" = "mips-sni-sysv4" ; then +@@ -53,11 +58,48 @@ + fi + + AC_CHECK_FUNCS(strerror) +-AC_CHECK_FUNCS(gettext) +-AC_CHECK_FUNCS(dgettext) + AC_CHECK_FUNC(setreuid, [], [ + AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) + ]) ++ ++dnl ++dnl handle --disable-nls ++dnl ++AC_ARG_ENABLE([nls], ++[ --disable-nls do not use National Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ ++if test "$USE_NLS" != "no"; then ++ AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"], ++ AC_CHECK_LIB(intl, gettext, [LIBINTL="-lintl" HAVEGETTEXT="y"], ++ AC_MSG_WARN([sorry this package needs libintl.a (from the ++ gettext package)]) ++ ) ++ ) ++ ++ AC_CHECK_PROG(XGETTEXT, xgettext, xgettext) ++ ++ if test "$XGETTEXT" != ""; then ++ if xgettext --help 2>&1 | grep illegal >/dev/null ; then ++ echo "xgettext isn't GNU version" ++ XGETTEXT="" ++ fi ++ fi ++ ++ if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then ++ echo "xgettext and gettext() exist; will build i18n support" ++ PO=po ++ else ++ echo "xgettext and libintl.a don't both exist; will not build i18n support" ++ fi ++else ++ echo "user specificed no gettext; will not build i18n support" ++fi ++ ++if test "$PO" = po; then ++ AC_CHECK_HEADERS(libintl.h) ++fi ++AC_SUBST(PO) + + AC_OUTPUT([Makefile po/Makefile.in], + [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) diff -urN /usr/ports/misc/rpm/patches/patch-at misc/rpm/patches/patch-at --- /usr/ports/misc/rpm/patches/patch-at Thu Jan 1 09:00:00 1970 +++ misc/rpm/patches/patch-at Tue Nov 9 04:37:35 1999 @@ -0,0 +1,17 @@ +--- scripts/Makefile.in.orig Tue Oct 6 02:06:56 1998 ++++ scripts/Makefile.in Tue Nov 9 03:49:49 1999 +@@ -4,6 +4,7 @@ + + INSTALL= @INSTALL@ + INSTALL_PROGRAM= @INSTALL_PROGRAM@ ++INSTALL_SCRIPT= @INSTALL_SCRIPT@ + INSTALL_DATA= @INSTALL_DATA@ + + SCRIPTS= freshen.sh find-lang.sh +@@ -12,5 +13,5 @@ + + install: + for n in $(SCRIPTS); do \ +- $(INSTALL_DATA) -m 755 $$n $(installprefix)/$(RPMCONFIGDIR); \ ++ $(INSTALL_SCRIPT) $$n $(installprefix)/$(RPMCONFIGDIR); \ + done diff -urN /usr/ports/misc/rpm/pkg/DESCR misc/rpm/pkg/DESCR --- /usr/ports/misc/rpm/pkg/DESCR Mon Nov 1 21:16:30 1999 +++ misc/rpm/pkg/DESCR Mon Nov 8 23:53:23 1999 @@ -1,6 +1,6 @@ This is the Red Hat Package Manager. -Note: +FYI: There is also a rpm2cpio converter written in perl. You don't have to install the whole RPM manager to get the files in an RPM. diff -urN /usr/ports/misc/rpm/pkg/PLIST misc/rpm/pkg/PLIST --- /usr/ports/misc/rpm/pkg/PLIST Tue May 4 21:06:22 1999 +++ misc/rpm/pkg/PLIST Mon Nov 8 20:46:25 1999 @@ -5,16 +5,16 @@ include/rpm/dbindex.h include/rpm/header.h lib/librpm.a -@unexec rm %D/lib/rpmrc -@unexec rm %D/lib/rpmpopt -lib/rpm/mkinstalldirs -lib/rpm/find-provides -lib/rpm/find-requires -lib/rpm/rpmrc -lib/rpm/rpmpopt -lib/rpm/freshen.sh -lib/rpm/find-lang.sh -@exec ln -sf %D/lib/rpm/rpmrc %D/lib/rpmrc -@exec ln -sf %D/lib/rpm/rpmpopt %D/lib/rpmpopt +@unexec rm %D/etc/rpmrc +@unexec rm %D/etc/rpmpopt +etc/rpm/mkinstalldirs +etc/rpm/find-provides +etc/rpm/find-requires +etc/rpm/rpmrc +etc/rpm/rpmpopt +etc/rpm/freshen.sh +etc/rpm/find-lang.sh +@exec ln -sf %D/etc/rpm/rpmrc %D/etc/rpmrc +@exec ln -sf %D/etc/rpm/rpmpopt %D/etc/rpmpopt @dirrm include/rpm -@dirrm lib/rpm +@dirrm etc/rpm >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message