[27587] trunk/dports/sysutils
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 9 05:55:59 PDT 2007
Revision: 27587
http://trac.macosforge.org/projects/macports/changeset/27587
Author: afb at macports.org
Date: 2007-08-09 05:55:58 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
This is the development version of RPM5 (from rpm5.org)
It can build either the latest .src.rpm, or CVS HEAD...
Left the zlib/file/bdb/lua internals out for now, since
I didn't want to bother with fetching the required code.
Added Paths:
-----------
trunk/dports/sysutils/rpm-devel/
trunk/dports/sysutils/rpm-devel/Portfile
trunk/dports/sysutils/rpm-devel/files/
trunk/dports/sysutils/rpm-devel/files/patch-configure
trunk/dports/sysutils/rpm-devel/files/patch-darwin.prov
trunk/dports/sysutils/rpm-devel/files/patch-fts.c
trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs
trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm
trunk/dports/sysutils/rpm-devel/files/patch-rpmevr.h
trunk/dports/sysutils/rpm-devel/files/patch-rpmio.h
trunk/dports/sysutils/rpm-devel/files/patch-rpmpgp.h
trunk/dports/sysutils/rpm-devel/files/rpm2cpio.pl
Added: trunk/dports/sysutils/rpm-devel/Portfile
===================================================================
--- trunk/dports/sysutils/rpm-devel/Portfile (rev 0)
+++ trunk/dports/sysutils/rpm-devel/Portfile 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,128 @@
+# $Id$
+
+PortSystem 1.0
+
+name rpm-devel
+version 5.0
+platforms darwin freebsd
+categories sysutils archivers
+maintainers n3npq at mac.com afb at macports.org
+description The RPM package management system.
+long_description The RPM Package Manager (RPM) is a powerful command line driven \
+ package management system capable of installing, uninstalling, \
+ verifying, querying, and updating software packages. Each software \
+ package consists of an archive of files along with information about \
+ the package like its version, a description, etc.
+
+homepage http://rpm5.org
+master_sites ${homepage}/files/rpm/rpm-5.0
+#distname rpm-${version}-0.2
+##distdate 20070618
+#checksums md5 6fa9aebb436f2b50c625f183efa86250
+#worksrcdir rpm-${version}
+#
+### CVS source
+fetch.type cvs
+cvs.root :pserver:anonymous at rpm5.org:/cvs
+cvs.module rpm
+#cvs.date 20070808
+cvs.tag HEAD
+worksrcdir rpm
+
+depends_build port:expat port:neon \
+ port:python24 port:perl5.8 \
+ port:readline port:beecrypt \
+ port:libiconv port:gettext
+
+depends_lib lib:libhistory.5:readline port:gettext \
+ port:popt port:sqlite3 port:zlib port:file
+
+depends_run port:openssl \
+ bin:gzip:gzip \
+ bin:bzip2:bzip2 \
+ bin:unzip:unzip
+
+#extract.suffix .src.rpm
+#extract.cmd ${filespath}/rpm2cpio.pl
+#extract.pre_args
+#extract.post_args | cpio -dvim rpm-${version}.tar.gz && \
+# gzip -dc rpm-${version}.tar.gz | tar -xf -
+#
+#patchfiles patch-macros.in-rpm \
+# patch-configure \
+# patch-darwin.prov \
+# patch-rpmevr.h \
+# patch-fts.c \
+# patch-rpmio.h
+#
+### CVS files
+patchfiles patch-macros.in-cvs \
+ patch-darwin.prov \
+ patch-rpmevr.h \
+ patch-fts.c \
+ patch-rpmpgp.h
+
+build.type gnu
+
+configure.args --disable-nls --without-javaglue --without-included-gettext \
+ --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
+ --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
+ --with-python=2.4 --with-perl=5.8.8 --sysconfdir=${prefix}/etc
+
+### CVS config
+configure.args-append --with-sqlite --with-dbapi=sqlite --with-path-cfg=${prefix}/etc/rpm \
+ --without-lua --without-db --with-bugreport=afb at macports.org
+configure.cmd ./autogen.sh && ./configure
+pre-configure {
+ xinstall -d lua
+ touch lua/Makefile.in
+}
+
+post-destroot {
+ # MacPorts specific changes
+ reinplace "s;%{_usr}/src/rpm;%{_usr}/src/macports;" ${destroot}${prefix}/lib/rpm/macros
+
+ xinstall -d -m 755 ${prefix}/etc/rpm
+
+ delete [glob ${destroot}${prefix}/lib/perl5/*/*/*/auto/RPM/.packlist]
+ delete [glob ${destroot}${prefix}/lib/perl5/*/*/perllocal.pod]
+
+ # where the RPM database lives
+ destroot.keepdirs ${destroot}${prefix}/etc/rpm\
+ ${destroot}${prefix}/var/lib/rpm\
+ ${destroot}${prefix}/var/spool/repackage\
+ ${destroot}${prefix}/src/macports/BUILD\
+ ${destroot}${prefix}/src/macports/RPMS\
+ ${destroot}${prefix}/src/macports/SOURCES\
+ ${destroot}${prefix}/src/macports/SPECS\
+ ${destroot}${prefix}/src/macports/SRPMS\
+ ${destroot}${prefix}/src/macports/TR
+}
+
+platform darwin {
+ configure.args-append --disable-optimized --disable-aio \
+ --with-glob --enable-broken-chown \
+ --disable-rpath
+
+ configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
+
+ post-destroot {
+ # MacOSX specific changes
+ reinplace "s;\tlibtoolize;\tglibtoolize;" ${destroot}${prefix}/lib/rpm/macros
+ }
+}
+
+platform freebsd {
+
+ post-destroot {
+ # FreeBSD specific changes
+ reinplace "s;/usr/bin/tar;/usr/local/bin/gtar;" ${destroot}${prefix}/lib/rpm/macros
+ reinplace "s;/usr/bin/make;/usr/local/bin/gmake;" ${destroot}${prefix}/lib/rpm/macros
+ }
+}
+
+
+variant docs {
+ depends_run-append bin:doxygen:doxygen
+ configure.args-append --with-apidocs
+}
Property changes on: trunk/dports/sysutils/rpm-devel/Portfile
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/dports/sysutils/rpm-devel/files/patch-configure
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-configure (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-configure 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,24 @@
+--- configure.orig 2007-06-22 01:21:33.000000000 +0200
++++ configure 2007-06-22 01:23:43.000000000 +0200
+@@ -27309,8 +27309,8 @@
+ if test $ac_cv_lib_popt_poptGetContext = yes; then
+
+ WITH_POPT_SUBDIR=
+- WITH_POPT_INCLUDE=
+- WITH_POPT_LIB="-lpopt"
++ WITH_POPT_INCLUDE='-I${prefix}/include'
++ WITH_POPT_LIB='${prefix}/lib/libpopt.la'
+
+ fi
+
+@@ -27545,8 +27545,8 @@
+ _ACEOF
+
+ WITH_SQLITE3_SUBDIR=
+- WITH_SQLITE3_INCLUDE=
+- WITH_SQLITE3_LIB="-lsqlite"
++ WITH_SQLITE3_INCLUDE='-I${prefix}/include'
++ WITH_SQLITE3_LIB='${prefix}/lib/libsqlite3.la'
+ DBLIBSRCS="$DBLIBSRCS sqlite.c"
+
+ fi
Added: trunk/dports/sysutils/rpm-devel/files/patch-darwin.prov
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-darwin.prov (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-darwin.prov 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,11 @@
+--- autodeps/darwin.prov 2005-01-04 09:41:39.000000000 -0800
++++ autodeps/darwin.prov 2007-06-13 10:52:54.000000000 -0700
+@@ -5,7 +5,7 @@
+ # This script reads filenames from STDIN and outputs any relevant provides
+ # information that needs to be included in the package.
+
+-filelist=$(sed -n -e '/\.dylib/p' -e '/\.so/p' -e '/\.bundle/p' | sort | uniq | xargs file -L 2>/dev/null | grep "Mach-O.*ppc" | cut -d: -f1)
++filelist=$(sed -n -e '/\.dylib/p' -e '/\.so/p' -e '/\.bundle/p' -e '/\.jnilib/p' | sort | uniq | xargs file -L 2>/dev/null | grep "Mach-O.*" | cut -d: -f1)
+
+ for f in $filelist; do
+ libname=$(basename $f | sed -e 's;\..*;;')
Added: trunk/dports/sysutils/rpm-devel/files/patch-fts.c
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-fts.c (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-fts.c 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,18 @@
+--- rpmio/fts.c 2007-05-25 10:36:36.000000000 -0700
++++ rpmio/fts.c 2007-06-13 10:52:54.000000000 -0700
+@@ -34,6 +34,7 @@
+ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
+ #endif /* LIBC_SCCS and not lint */
+
++#include "system.h"
+ #if defined(_LIBC)
+ #include <sys/param.h>
+ #include <include/sys/stat.h>
+@@ -70,7 +71,6 @@
+ # define stat64 stat
+ # define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+ #endif
+-#include "system.h"
+ #include "fts.h"
+ #include "rpmio.h"
+ #include "rpmurl.h"
Property changes on: trunk/dports/sysutils/rpm-devel/files/patch-fts.c
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-macros.in-cvs 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,106 @@
+--- macros.in.orig 2007-08-06 13:27:27.000000000 +0200
++++ macros.in 2007-08-09 12:44:06.000000000 +0200
+@@ -181,7 +181,7 @@
+ %_dbpath_rebuild %{_dbpath}
+
+ #
+-# Path to script that creates debug symbols in a /usr/lib/debug
++# Path to script that creates debug symbols in a @prefix@/lib/debug
+ # shadow tree.
+ %__debug_install_post \
+ %{_rpmhome}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+@@ -300,7 +300,7 @@
+
+ # The PATH put into the environment before running %pre/%post et al.
+ #
+-%_install_script_path /sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
++%_install_script_path @prefix@/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
+
+ # A colon separated list of desired locales to be installed;
+ # "all" means install all locale specific files.
+@@ -737,7 +737,7 @@
+ # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
+ #
+ # XXX Note: escaped %% for use in headerSprintf()
+-#%_hrmib_path /var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
++#%_hrmib_path @prefix@/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
+
+ #==============================================================================
+ # ---- GPG/PGP/PGP5 signature macros.
+@@ -825,11 +825,11 @@
+ # The path to the dependency universe database. The default value
+ # is the rpmdb-vendor location. The macro is usually defined in
+ # %{_etcrpm}/macros.solve, installed with the rpmdb-vendor package.
+-#%_solve_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
++#%_solve_dbpath @prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
+
+ # The path to the dependency universe packages. This should
+ # be a path to the packages contained in the solve database.
+-#%_solve_pkgsdir /mnt/rpm/test/latest-i386/RedHat/RPMS/
++#%_solve_pkgsdir @prefix@/src/%{_vendor}/RPMS/ppc
+
+ # The output binary package file name template used when suggesting
+ # binary packages that solve a dependency. The macro is usually defined
+@@ -975,7 +975,7 @@
+ %_rpmds_perldeps_cmd %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
+
+ #
+-%_varrun /var/run
++%_varrun @prefix@/var/run
+
+ #==============================================================================
+ # ---- Cache configuration macros.
+@@ -1000,7 +1000,7 @@
+ %_bhA %{nil}
+
+ # The cache database directory.
+-%_cache_dbpath /var/cache/yum/rpmdb
++%_cache_dbpath @prefix@/var/cache/yum/rpmdb
+
+ #==============================================================================
+ # ---- per-platform macros.
+@@ -1213,7 +1213,7 @@
+ %_lib lib
+ %_libdir %{_exec_prefix}/%{_lib}
+ %_includedir %{_prefix}/include
+-%_oldincludedir /usr/include
++%_oldincludedir @prefix@/include
+ %_infodir %{_prefix}/info
+ %_mandir %{_prefix}/man
+ %_localedir %{_datadir}/locale
+@@ -1475,7 +1475,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__java_provides %{_rpmhome}/javadeps.sh --provides
+-%__java_requires %{_rpmhome}/javadeps.sh --requires
++#%__java_requires %{_rpmhome}/javadeps.sh --requires
+
+ #------------------------------------------------------------------------
+ # libtool(...) configuration.
+@@ -1485,7 +1485,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
+-%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
++#%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
+
+ #------------------------------------------------------------------------
+ # pkgconfig(...) configuration.
+@@ -1495,7 +1495,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
+-%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
++#%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
+
+ #------------------------------------------------------------------------
+ # mono(...) configuration.
+@@ -1516,7 +1516,7 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
+ #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
+-%__scriptlet_requires /bin/bash --rpm-requires
++#%__scriptlet_requires /bin/bash --rpm-requires
+
+ # \endverbatim
+ #*/
Added: trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-macros.in-rpm 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,137 @@
+--- macros.in.orig 2007-06-17 03:21:39.000000000 +0200
++++ macros.in 2007-08-09 11:43:51.000000000 +0200
+@@ -181,7 +181,7 @@
+ %_dbpath_rebuild %{_dbpath}
+
+ #
+-# Path to script that creates debug symbols in a /usr/lib/debug
++# Path to script that creates debug symbols in a @prefix@/lib/debug
+ # shadow tree.
+ %__debug_install_post \
+ %{_rpmhome}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+@@ -300,7 +300,7 @@
+
+ # The PATH put into the environment before running %pre/%post et al.
+ #
+-%_install_script_path /sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
++%_install_script_path @prefix@/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
+
+ # A colon separated list of desired locales to be installed;
+ # "all" means install all locale specific files.
+@@ -629,7 +629,7 @@
+ %{!?_rpmdb_rebuild:%{__dbi_btconfig_current}}\
+ %{nil}
+
+-%_dbi_tags Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys:Packagecolor
++%_dbi_tags Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Pubkeys
+
+ %_dbi_config_Dirnames %{_dbi_btconfig}
+ %_dbi_config_Requireversion %{_dbi_btconfig}
+@@ -662,17 +662,18 @@
+ # XXX legacy configuration.
+ # Choose db interface:
+ # 3 native db3 interface.
++# 4 new sqlite3 interface.
+ #
+ # There are two macros so that --rebuilddb can convert db1 -> db3.
+ #
+-%_dbapi 3
+-%_dbapi_rebuild 3
++%_dbapi 4
++%_dbapi_rebuild 4
+
+ #
+ # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
+ #
+ # XXX Note: escaped %% for use in headerSprintf()
+-%_hrmib_path /var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
++%_hrmib_path @prefix@/var/cache/hrmib/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}
+
+ #==============================================================================
+ # ---- GPG/PGP/PGP5 signature macros.
+@@ -760,11 +761,11 @@
+ # The path to the dependency universe database. The default value
+ # is the rpmdb-vendor location. The macro is usually defined in
+ # %{_etcrpm}/macros.solve, installed with the rpmdb-vendor package.
+-#%_solve_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
++#%_solve_dbpath @prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
+
+ # The path to the dependency universe packages. This should
+ # be a path to the packages contained in the solve database.
+-#%_solve_pkgsdir /mnt/rpm/test/latest-i386/RedHat/RPMS/
++#%_solve_pkgsdir @prefix@/src/%{_vendor}/RPMS/ppc
+
+ # The output binary package file name template used when suggesting
+ # binary packages that solve a dependency. The macro is usually defined
+@@ -781,7 +782,7 @@
+
+ # The directory in which erased packages will be saved when using
+ # the --repackage option.
+-%_repackage_dir /var/spool/repackage
++%_repackage_dir @prefix@/var/spool/repackage
+
+ # A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
+ %_repackage_root %{nil}
+@@ -912,7 +913,7 @@
+ %_rpmds_perldeps_cmd %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
+
+ #
+-%_varrun /var/run
++%_varrun @prefix@/var/run
+
+ #==============================================================================
+ # ---- Cache configuration macros.
+@@ -937,7 +938,7 @@
+ %_bhA %{nil}
+
+ # The cache database directory.
+-%_cache_dbpath /var/cache/yum/rpmdb
++%_cache_dbpath @prefix@/var/cache/yum/rpmdb
+
+ #==============================================================================
+ # ---- per-platform macros.
+@@ -1150,7 +1151,7 @@
+ %_lib lib
+ %_libdir %{_exec_prefix}/%{_lib}
+ %_includedir %{_prefix}/include
+-%_oldincludedir /usr/include
++%_oldincludedir @prefix@/include
+ %_infodir %{_prefix}/info
+ %_mandir %{_prefix}/man
+ %_localedir %{_datadir}/locale
+@@ -1412,7 +1413,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__java_provides %{_rpmhome}/javadeps.sh --provides
+-%__java_requires %{_rpmhome}/javadeps.sh --requires
++#%__java_requires %{_rpmhome}/javadeps.sh --requires
+
+ #------------------------------------------------------------------------
+ # libtool(...) configuration.
+@@ -1422,7 +1423,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
+-%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
++#%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
+
+ #------------------------------------------------------------------------
+ # pkgconfig(...) configuration.
+@@ -1432,7 +1433,7 @@
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
+-%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
++#%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
+
+ #------------------------------------------------------------------------
+ # executable(...) configuration.
+@@ -1443,7 +1444,7 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
+ #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
+-%__scriptlet_requires /bin/bash --rpm-requires
++#%__scriptlet_requires /bin/bash --rpm-requires
+
+ # \endverbatim
+ #*/
Added: trunk/dports/sysutils/rpm-devel/files/patch-rpmevr.h
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-rpmevr.h (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-rpmevr.h 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,21 @@
+--- ./lib/rpmevr.h.orig 2007-05-16 12:55:05.000000000 +0200
++++ ./lib/rpmevr.h 2007-06-20 10:13:14.000000000 +0200
+@@ -18,8 +18,6 @@
+ /**
+ * Dependency Attributes.
+ */
+-typedef enum evrFlags_e rpmsenseFlags;
+-typedef enum evrFlags_e evrFlags;
+
+ /*@-matchfields@*/
+ enum evrFlags_e {
+@@ -67,6 +65,9 @@
+ };
+ /*@=matchfields@*/
+
++typedef enum evrFlags_e rpmsenseFlags;
++typedef enum evrFlags_e evrFlags;
++
+ #define RPMSENSE_SENSEMASK 0x0e /* Mask to get senses, ie serial, */
+ /* less, greater, equal. */
+ #define RPMSENSE_NOTEQUAL (RPMSENSE_EQUAL ^ RPMSENSE_SENSEMASK)
Property changes on: trunk/dports/sysutils/rpm-devel/files/patch-rpmevr.h
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/sysutils/rpm-devel/files/patch-rpmio.h
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-rpmio.h (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-rpmio.h 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,11 @@
+--- rpmio/rpmio.h 2007/06/17 14:49:02 1.53
++++ rpmio/rpmio.h 2007/07/10 19:46:20 1.54
+@@ -664,7 +664,7 @@
+ * @param prompt prompt string
+ * @return password
+ */
+-char * (*Getpass) (const char * prompt)
++extern char * (*Getpass) (const char * prompt)
+ /*@*/;
+ char * _GetPass (const char * prompt)
+ /*@*/;
Property changes on: trunk/dports/sysutils/rpm-devel/files/patch-rpmio.h
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/sysutils/rpm-devel/files/patch-rpmpgp.h
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-rpmpgp.h (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-rpmpgp.h 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,11 @@
+--- rpmio/rpmpgp.h.orig 2007-07-10 15:09:24.000000000 +0200
++++ rpmio/rpmpgp.h 2007-08-09 13:22:55.000000000 +0200
+@@ -13,6 +13,8 @@
+ #include <string.h>
+ #include <popt.h>
+
++#include "beecrypt/api.h"
++
+ #if !defined(_BEECRYPT_API_H)
+ /*@-redef@*/
+ typedef unsigned char byte;
Property changes on: trunk/dports/sysutils/rpm-devel/files/patch-rpmpgp.h
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/sysutils/rpm-devel/files/rpm2cpio.pl
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/rpm2cpio.pl (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/rpm2cpio.pl 2007-08-09 12:55:58 UTC (rev 27587)
@@ -0,0 +1,89 @@
+#!/usr/bin/perl
+
+# Copyright (C) 1997,1998,1999, Roger Espel Llima
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and any associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# SOFTWARE'S COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE
+
+# (whew, that's done!)
+
+# why does the world need another rpm2cpio? because the existing one
+# won't build unless you have half a ton of things that aren't really
+# required for it, since it uses the same library used to extract RPM's.
+# in particular, it won't build on the HPsUX box i'm on.
+
+
+# add a path if desired
+$gzip = "gzip";
+
+sub printhelp {
+ print <<HERE;
+rpm2cpio, perl version by orabidoo <odar\@pobox.com>
+dumps the contents to stdout as a cpio archive
+
+use: rpm2cpio [file.rpm] > file.cpio
+
+Here's how to use cpio:
+ list of contents: cpio -t -i < /file/name
+ extract files: cpio -d -i < /file/name
+HERE
+
+ exit 0;
+}
+
+if ($#ARGV == -1) {
+ printhelp if -t STDIN;
+ $f = "STDIN";
+} elsif ($#ARGV == 0) {
+ open(F, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
+ $f = 'F';
+} else {
+ printhelp;
+}
+
+printhelp if -t STDOUT;
+
+# gobble the file up
+undef $/;
+$|=1;
+$rpm = <$f>;
+close ($f);
+
+($magic, $major, $minor, $crap) = unpack("NCC C90", $rpm);
+
+die "Not an RPM\n" if $magic != 0xedabeedb;
+die "Not a version 3 or 4 RPM\n" if $major != 3 && $major != 4;
+
+$rpm = substr($rpm, 96);
+
+while ($rpm ne '') {
+ $rpm =~ s/^\c@*//s;
+ ($magic, $crap, $sections, $bytes) = unpack("N4", $rpm);
+ $smagic = unpack("n", $rpm);
+ last if $smagic eq 0x1f8b;
+ die "Error: header not recognized\n" if $magic != 0x8eade801;
+ $rpm = substr($rpm, 16*(1+$sections) + $bytes);
+}
+
+die "bogus RPM\n" if $rpm eq '';
+
+open(ZCAT, "|gzip -cd") || die "can't pipe to gzip\n";
+#print STDERR "CPIO archive found!\n";
+print ZCAT $rpm;
+close ZCAT;
+
Property changes on: trunk/dports/sysutils/rpm-devel/files/rpm2cpio.pl
___________________________________________________________________
Name: svn:executable
+ *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070809/f4963bfe/attachment.html
More information about the macports-changes
mailing list