Ignore:
Timestamp:
Mar 24, 2006, 8:25:38 AM (14 years ago)
Author:
olegb
Message:

Bug:
Submitted by: jbj
Reviewed by: olegb
Approved by:
Obtained from:

maintainer bump to rpm 4.4.5

thanks jbj!

Location:
trunk/dports/sysutils/rpm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/rpm/Portfile

    r16844 r17151  
    1 # $Id: Portfile,v 1.25 2006/03/08 23:56:20 mww Exp $
     1# $Id: Portfile,v 1.26 2006/03/24 08:25:37 olegb Exp $
    22
    33PortSystem 1.0
    44name                    rpm
    5 version                 4.4.2
    6 revision                3
     5version                 4.4.5
    76platforms               darwin
    87categories              sysutils archivers
     
    1615        the package like its version, a description, etc.
    1716
    18 master_sites            ftp://jbj.org/pub/rpm-4.4.x/
     17master_sites            http://wraptastic.org/pub/rpm-4.4.x/
    1918distfiles               rpm-${version}.tar.gz
    20 checksums               md5 e24ce468082479fe850c9d6563f56db5
     19checksums               md5 d5f434789c0c56d05d77be6f4262a561
    2120
    2221depends_lib             lib:libhistory.5:readline lib:libiconv.2:libiconv \
     
    5251variant darwin {
    5352        patchfiles-append \
    54                 rpm-4.4.1-glob.patch patch-file-src-Makefile.in \
     53                patch-file-src-Makefile.in \
     54                patch-lib-rpmds \
    5555                patch-macros.in
    5656
     
    9595                system "rm -f ${destroot}${prefix}/share/man/man3/popt.3*"
    9696                system "rm -rf ${destroot}${prefix}/lib/libpopt.*"
     97                system "rm -rf ${destroot}/System"
     98                system "rm -rf ${destroot}/Library"
     99                system "rm ${destroot}/usr/local/man/man3/RPM.3pm"
    97100
    98101                # MacOSX specific changes
  • trunk/dports/sysutils/rpm/files/patch-macros.in

    r13203 r17151  
    1 --- macros.in.jbj       2005-07-24 15:05:47.000000000 -0400
    2 +++ macros.in   2005-07-24 15:32:54.000000000 -0400
     1--- macros.in.orig      2006-02-12 13:34:12.000000000 -0500
     2+++ macros.in   2006-03-08 10:42:53.000000000 -0500
    33@@ -33,58 +33,58 @@
    44 #==============================================================================
     
    114114 %__debug_install_post   \
    115115    @RPMCONFIGDIR@/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
    116 @@ -215,10 +215,10 @@
     116@@ -211,10 +211,10 @@
    117117 %_srcrpmdir            %{_topdir}/SRPMS
    118118 
     
    122122 
    123123 #      Path to top of build area.
    124 -%_topdir               %{_usrsrc}/redhat
     124-%_topdir               %{_usrsrc}/rpm
    125125+%_topdir               %{_usrsrc}/apple
    126126 
    127127 #      The path to the unzip executable (legacy, use %{__unzip} instead).
    128128 %_unzipbin             %{__unzip}
    129 @@ -276,7 +276,7 @@
     129@@ -279,7 +279,7 @@
    130130 
    131131 #      The PATH put into the environment before running %pre/%post et al.
     
    136136 #      A colon separated list of desired locales to be installed;
    137137 #      "all" means install all locale specific files.
    138 @@ -585,7 +585,7 @@
     138@@ -575,7 +575,7 @@
    139139 %{nil}
    140140 
     
    145145 # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
    146146 %_dbi_config_Packages          %{_dbi_htconfig} lockdbfd
    147 @@ -607,8 +607,8 @@
     147@@ -597,8 +597,8 @@
    148148 #
    149149 # There are two macros so that --rebuilddb can convert db1 -> db3.
     
    156156 #==============================================================================
    157157 # ---- GPG/PGP/PGP5 signature macros.
    158 @@ -690,17 +690,17 @@
    159  %_autorelocate_dcolor @autorelocate_dcolor@
    160  
     158@@ -682,15 +682,15 @@
    161159 #      The path to the dependency universe database. The default value
    162 -#      is the rpmdb-redhat location. The macro is usually defined in
    163 -#      /etc/rpm/macros.solve, installed with the rpmdb-redhat package.
    164 -#%_solve_dbpath        /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat
    165 +#      is the rpmdb-dports location. The macro is usually defined in
    166 +#      /etc/rpm/macros.solve, installed with the rpmdb-dports package.
    167 +#%_solve_dbpath        @prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/dports
     160 #      is the rpmdb-vendor location. The macro is usually defined in
     161 #      /etc/rpm/macros.solve, installed with the rpmdb-vendor package.
     162-#%_solve_dbpath        /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
     163+#%_solve_dbpath        @prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
    168164 
    169165 #      The path to the dependency universe packages. This should
    170166 #      be a path to the packages contained in the solve database.
    171 -#%_solve_pkgsdir       /mnt/redhat/test/latest-i386/RedHat/RPMS/
    172 +#%_solve_pkgsdir       @prefix@/src/apple/RPMS/ppc
     167-#%_solve_pkgsdir       /mnt/rpm/test/latest-i386/RedHat/RPMS/
     168+#%_solve_pkgsdir       @prefix@/src/%{_vendor}/RPMS/ppc
    173169 
    174170 #      The output binary package file name template used when suggesting
    175171 #      binary packages that solve a dependency. The macro is usually defined
    176 -#      in /etc/rpm/macros.solve, installed with the rpmdb-redhat package.
     172-#      in /etc/rpm/macros.solve, installed with the rpmdb-vendor package.
    177173+#      in /etc/rpm/macros.solve, installed with the rpmdb-dports package.
    178174 #
    179175 # XXX  Note: escaped %% for use in headerSprintf()
    180176 #%_solve_name_fmt      %{?_solve_pkgsdir}%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
    181 @@ -866,7 +866,7 @@
    182  #      solve dependencies using rpmcache(8).
    183  #
    184  #      Note: These values are specific to my machine, and most certainly
    185 -#      are incorrect for any non-redhat.com machine. The macros are
    186 +#      need to configured on your machine. The macros are
    187  #      included here only to document the macro names and usage.
    188  %_bhpath        file://localhost/mnt/dist
    189  %_bhcoll        @(7.3|7.2|7.1|7.1sbe|7.1k|7.0|7.01j|7.0j|7.0sbe|7.0tc|6.2|6.2ha|6.2ee|6.1|6.0|5.2|5.1|5.0)
    190 @@ -1079,7 +1079,7 @@
     177@@ -1087,7 +1087,7 @@
    191178 %_lib                  lib
    192179 %_libdir               %{_exec_prefix}/%{_lib}
     
    197184 %_mandir               %{_prefix}/man
    198185 
     186@@ -1336,7 +1336,7 @@
     187 # Note: Used iff _use_internal_dependency_generator is non-zero. The
     188 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
     189 %__java_provides       @RPMCONFIGDIR@/javadeps.sh --provides
     190-%__java_requires       @RPMCONFIGDIR@/javadeps.sh --requires
     191+#%__java_requires      @RPMCONFIGDIR@/javadeps.sh --requires
     192 
     193 #------------------------------------------------------------------------
     194 # libtool(...) configuration.
     195@@ -1346,7 +1346,7 @@
     196 # Note: Used iff _use_internal_dependency_generator is non-zero. The
     197 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
     198 %__libtool_provides    @RPMCONFIGDIR@/libtooldeps.sh --provides %{buildroot}
     199-%__libtool_requires    @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot}
     200+#%__libtool_requires   @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot}
     201 
     202 #------------------------------------------------------------------------
     203 # pkgconfig(...) configuration.
     204@@ -1356,7 +1356,7 @@
     205 # Note: Used iff _use_internal_dependency_generator is non-zero. The
     206 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
     207 %__pkgconfig_provides  @RPMCONFIGDIR@/pkgconfigdeps.sh --provides
     208-%__pkgconfig_requires  @RPMCONFIGDIR@/pkgconfigdeps.sh --requires
     209+#%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires
     210 
     211 #------------------------------------------------------------------------
     212 # executable(...) configuration.
Note: See TracChangeset for help on using the changeset viewer.