Date: Tue, 17 Oct 2000 05:30:56 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22046: Update port: misc/rpm Message-ID: <20001017123056.AB97E37B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22046
>Category: ports
>Synopsis: Update port: misc/rpm
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 17 05:40:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Add devel/popt to LIB_DEPENDS and prevent installing own version of popt
(to avoid breakage of devel/popt and dependancy ports)
- Remove MANLANG and install english manpages only
(MANLANG assumes existance of same manpage set per language. it cannot work
correctly even if one manpage is lacking at one language.)
- Fix typo
(INSTALL_SHLIB -> INSTALLS_SHLIB)
New file:
patches/patch-bc patches/patch-bd patches/patch-be patches/patch-bf
patches/patch-bg
Remove file:
patches/patch-au patches/patch-az
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/rpm/Makefile misc/rpm/Makefile
--- /usr/ports/misc/rpm/Makefile Tue Oct 17 19:51:59 2000
+++ misc/rpm/Makefile Tue Oct 17 20:04:37 2000
@@ -13,7 +13,8 @@
MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext \
+ popt.0:${PORTSDIR}/devel/popt
USE_GMAKE= yes
USE_AUTOMAKE= yes
@@ -21,20 +22,19 @@
CONFIGURE_ARGS= --with-glob
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-INSTALL_SHLIB= yes
-
-MANLANG= "" ja pl ru
+INSTALLS_SHLIB= yes
MAN1= gendiff.1
-MAN3= popt.3
MAN8= rpm.8 rpm2cpio.8
-post-configure:
- ( WRKSRC=${WRKSRC}/popt make do-configure )
-
post-patch:
.for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c
- @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+ @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
.endfor
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/doc/gendiff.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/rpm.8 ${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/doc/rpm2cpio.8 ${PREFIX}/man/man8
.include <bsd.port.mk>
diff -urN /usr/ports/misc/rpm/files/patch-au misc/rpm/files/patch-au
--- /usr/ports/misc/rpm/files/patch-au Tue Oct 17 17:42:03 2000
+++ misc/rpm/files/patch-au Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
---- popt/system.h.orig Tue Oct 10 12:36:36 2000
-+++ popt/system.h Tue Oct 10 12:37:14 2000
-@@ -2,6 +2,10 @@
- #include "config.h"
- #endif
-
-+#ifdef __FreeBSD__
-+#include <float.h>
-+#endif
-+
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
diff -urN /usr/ports/misc/rpm/files/patch-az misc/rpm/files/patch-az
--- /usr/ports/misc/rpm/files/patch-az Tue Oct 17 17:42:03 2000
+++ misc/rpm/files/patch-az Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- popt/aclocal.m4.orig Mon Oct 16 17:11:04 2000
-+++ popt/aclocal.m4 Mon Oct 16 17:11:22 2000
-@@ -724,7 +724,7 @@
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
-- DATADIRNAME=lib])
-+ DATADIRNAME=share])
- INSTOBJEXT=.mo
- fi
- fi
diff -urN /usr/ports/misc/rpm/files/patch-bc misc/rpm/files/patch-bc
--- /usr/ports/misc/rpm/files/patch-bc Thu Jan 1 09:00:00 1970
+++ misc/rpm/files/patch-bc Tue Oct 17 19:53:08 2000
@@ -0,0 +1,57 @@
+--- configure.in.orig Thu Sep 14 04:39:40 2000
++++ configure.in Wed Oct 4 23:13:46 2000
+@@ -369,7 +369,7 @@
+ AC_CHECK_HEADERS(netinet/in_systm.h)
+ AC_CHECK_HEADERS(machine/types.h)
+ AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h)
+-AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h)
++AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/param.h sys/vmount.h)
+ AC_CHECK_HEADERS(bzlib.h libio.h zlib.h)
+ AC_CHECK_HEADERS(err.h mcheck.h)
+
+@@ -431,6 +431,9 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/mount.h> ],
+ [struct statfs sfs;],
+ [AC_MSG_RESULT(in sys/mount.h)
+@@ -744,7 +747,7 @@
+ AC_SUBST(ROOT_GROUP)
+
+ if test "x$varprefix" = "x"; then
+- varprefix=`echo $prefix | sed 's/usr/var/'`
++ varprefix=`echo /var`
+ test "x$prefix" = xNONE && varprefix=`echo $ac_default_prefix | sed 's/usr/var/'`
+ fi
+ AC_SUBST(varprefix)
+@@ -872,7 +875,7 @@
+ RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
+ AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR")
+ AC_SUBST(RPMCONFIGDIR)
+-SYSCONFIGDIR="`echo /etc/rpm`"
++SYSCONFIGDIR="`echo ${usrprefix}/etc/rpm`"
+ AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR")
+ AC_SUBST(SYSCONFIGDIR)
+ LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
+@@ -911,7 +914,6 @@
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+
+-AC_CONFIG_SUBDIRS(popt)
+ AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
+ lib/Makefile build/Makefile tools/Makefile scripts/Makefile
+ tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
+@@ -919,8 +921,7 @@
+ doc/Makefile doc/manual/Makefile
+ doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
+ python/Makefile perl/Makefile perl/Makefile.PL],
+- [echo timestamp > popt/stamp-h.in
+- echo timestamp > stamp-h.in])
++ [echo timestamp > stamp-h.in])
+ dnl touch Makefile.in
+ dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+
diff -urN /usr/ports/misc/rpm/files/patch-bd misc/rpm/files/patch-bd
--- /usr/ports/misc/rpm/files/patch-bd Thu Jan 1 09:00:00 1970
+++ misc/rpm/files/patch-bd Tue Oct 17 19:53:08 2000
@@ -0,0 +1,26 @@
+--- Makefile.am.orig Thu Sep 14 02:36:40 2000
++++ Makefile.am Wed Oct 4 06:08:38 2000
+@@ -11,19 +11,19 @@
+ rpm.magic rpmpopt rpm.spec installplatform
+
+ # XXX TODO: python perl
+-SUBDIRS = intl po popt lib build misc tools scripts tests doc .
++SUBDIRS = intl po lib build misc tools scripts tests .
+
+-INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
++INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib \
+ @INCPATH@
+
+-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
++myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib
+
+ # XXX libtool can/should generate dependent libs.
+ # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
+ myldadd= \
+ $(top_builddir)/build/.libs/librpmbuild.a \
+ $(top_builddir)/lib/.libs/librpm.a \
+- $(top_builddir)/popt/.libs/libpopt.a \
++ -lpopt \
+ @INTLLIBS@ @LIBMISC@
+
+ LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
diff -urN /usr/ports/misc/rpm/files/patch-be misc/rpm/files/patch-be
--- /usr/ports/misc/rpm/files/patch-be Thu Jan 1 09:00:00 1970
+++ misc/rpm/files/patch-be Tue Oct 17 19:53:08 2000
@@ -0,0 +1,11 @@
+--- build/Makefile.am.orig Wed Jun 14 21:34:28 2000
++++ build/Makefile.am Wed Oct 4 05:02:45 2000
+@@ -2,7 +2,7 @@
+
+ AUTOMAKE_OPTIONS = 1.4 foreign
+
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib \
+ @INCPATH@
+
+ pkgincdir = $(pkgincludedir)
diff -urN /usr/ports/misc/rpm/files/patch-bf misc/rpm/files/patch-bf
--- /usr/ports/misc/rpm/files/patch-bf Thu Jan 1 09:00:00 1970
+++ misc/rpm/files/patch-bf Tue Oct 17 19:53:08 2000
@@ -0,0 +1,20 @@
+--- lib/Makefile.am.orig Mon Jul 17 03:49:43 2000
++++ lib/Makefile.am Wed Oct 4 05:32:09 2000
+@@ -2,7 +2,7 @@
+
+ AUTOMAKE_OPTIONS = 1.4 foreign
+
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@
+
+ pkgincdir = $(pkgincludedir)
+ pkginc_HEADERS = \
+@@ -12,7 +12,7 @@
+ lookup.h md5.h rpm_malloc.h \
+ rpmdb.h rpmlead.h signature.h
+
+-mylibpaths= -L$(top_builddir)/lib -L$(top_builddir)/popt
++mylibpaths= -L$(top_builddir)/lib
+ mylibs= -lrpm -lpopt @INTLLIBS@ @LIBMISC@
+
+ lib_LTLIBRARIES = librpm.la
diff -urN /usr/ports/misc/rpm/files/patch-bg misc/rpm/files/patch-bg
--- /usr/ports/misc/rpm/files/patch-bg Thu Jan 1 09:00:00 1970
+++ misc/rpm/files/patch-bg Tue Oct 17 19:53:07 2000
@@ -0,0 +1,24 @@
+--- tools/Makefile.am.orig Wed Jun 14 21:34:51 2000
++++ tools/Makefile.am Wed Oct 4 05:34:26 2000
+@@ -3,18 +3,18 @@
+ AUTOMAKE_OPTIONS = 1.4 foreign
+
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build \
+- -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
++ -I$(top_srcdir)/lib \
+ @INCPATH@ -I$(top_srcdir)/misc
+
+ EXTRA_DIST = fstrcmp.c message.c str-list.c rpmchecksig.c
+
+ EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject
+
+-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
++myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib
+ # XXX should libtool generate dependent libs?
+ myldadd= $(top_builddir)/build/librpmbuild.la \
+ $(top_builddir)/lib/librpm.la \
+- $(top_builddir)/popt/libpopt.la \
++ -lpopt \
+ @INTLLIBS@ @LIBMISC@
+
+ LDFLAGS = $(myldflags)
diff -urN /usr/ports/misc/rpm/pkg-plist misc/rpm/pkg-plist
--- /usr/ports/misc/rpm/pkg-plist Tue Oct 17 19:52:04 2000
+++ misc/rpm/pkg-plist Tue Oct 17 19:53:08 2000
@@ -1,7 +1,6 @@
bin/gendiff
bin/rpm
bin/rpm2cpio
-include/popt.h
include/rpm/dbindex.h
include/rpm/header.h
include/rpm/misc.h
@@ -18,10 +17,6 @@
lib/librpmbuild.a
lib/librpmbuild.so
lib/librpmbuild.so.0
-lib/libpopt.a
-lib/libpopt.la
-lib/libpopt.so
-lib/libpopt.so.0
lib/rpm/brp-compress
lib/rpm/brp-redhat
lib/rpm/brp-sparc64-linux
@@ -66,9 +61,7 @@
share/locale/ja/LC_MESSAGES/rpm.mo
share/locale/pl/LC_MESSAGES/rpm.mo
share/locale/pt_BR/LC_MESSAGES/rpm.mo
-share/locale/ro/LC_MESSAGES/popt.mo
share/locale/ru/LC_MESSAGES/rpm.mo
-share/locale/sk/LC_MESSAGES/popt.mo
share/locale/sk/LC_MESSAGES/rpm.mo
share/locale/sl/LC_MESSAGES/rpm.mo
share/locale/sr/LC_MESSAGES/rpm.mo
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001017123056.AB97E37B4C5>