[26315] trunk/dports/sysutils/rpm/Portfile

[source_changes at macosforge.org]

Revision: 26315
          http://trac.macosforge.org/projects/macports/changeset/26315
Author:   jmpp at macports.org
Date:     2007-06-19 10:06:22 -0700 (Tue, 19 Jun 2007)

Log Message:
-----------

Another cleanup of the rpm Portfile:

 * rpm now biulds and destroots on latest tiger, woot!
 * remove not commented out but apparently unnecessary legacy instructions (cf. __PYTHON export and others);
 * remove legacy instructions that were already commented out (we can put them back in later on if we figure out we really need them as rpm is used on Mac OS X, but the port destroots without them in any case);
 * temporarily comment out two post-destroot instructions inside the darwin platform that are necessary but are currently failing (Eridius: do we support widlcarding in our built-in `delete' implementation?);
 * other aesthetics changes to the Portfile to make it more human parseable.

Overall, the rpm port now builds and destroots (Latest Tiger, haven't tested other systems), but fails to install without being forced due to overlapping files with the popt port due to commented out instructions in post-destroot stage for the darwin platform, so once those are sorted out the Portfile should be ready to go!

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2007-06-19 16:47:20 UTC (rev 26314)
+++ trunk/dports/sysutils/rpm/Portfile	2007-06-19 17:06:22 UTC (rev 26315)
@@ -8,12 +8,11 @@
 categories		sysutils archivers
 maintainers		n3npq at mac.com
 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.
+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/${name}/${name}-4.4
@@ -32,43 +31,21 @@
 			port:bzip2 \
 			port:perl5.8
 
-			###zlib should be replaced with the internal rpm version:
-			#lib:libz:zlib
-			###"expat" is for libneon, and "readline" is for rpm lua
-			
-build.type	gnu
+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
 
-configure.cflags-append           __PYTHON="${prefix}/bin/python"
 
-
 platform darwin {
-	patchfiles-append \
-		patch-macros.in \
-		patch-popt-Makefile.in
+	patchfiles-append patch-macros.in \
+			  patch-popt-Makefile.in
 
-	post-patch {
-		delete ${worksrcpath}/beecrypt
-		delete ${worksrcpath}/elfutils
-		delete ${worksrcpath}/neon
-		delete ${worksrcpath}/sqlite
-	}
-
-#	use_autoconf	yes
-#	use_automake	yes
-
 	pre-configure {
 		      xinstall -d -m 755 ${workpath}/librt
-		      ln -sf /usr/lib/libSystem.B.dylib \
-				${workpath}/librt/librt.dylib
-
-#		      system "touch ${worksrcpath}/aclocal.m4"
-#		      system "touch ${worksrcpath}/config.h.in"
-
+		      ln -sf /usr/lib/libSystem.B.dylib ${workpath}/librt/librt.dylib
 	}
 
 	configure.args-append --disable-optimized --disable-aio \
@@ -78,19 +55,11 @@
 	configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
 	configure.ldflags-append -L${workpath}/librt
 
-#	post-configure {
-#		       system "find ${worksrcpath} -name Makefile.in | xargs touch"
-#		       system "find ${worksrcpath} -name Makefile | xargs touch"
-#	}
-
 	post-destroot {
 		# Delete overlapping files.
 		delete ${destroot}${prefix}/include/popt.h 
-		delete ${destroot}${prefix}/share/man/man3/popt.3*
-		delete ${destroot}${prefix}/lib/libpopt.*
-		delete ${destroot}/System
-		delete ${destroot}/Library
-		delete ${destroot}/usr/local/man/man3/RPM.3pm
+#		delete ${destroot}${prefix}/share/man/man3/popt.3*
+#		delete ${destroot}${prefix}/lib/libpopt.*
 
 		# MacOSX specific changes
 		reinplace "s;%{_usrsrc}/redhat;%{_usrsrc}/apple;" ${destroot}${prefix}/lib/rpm/macros
@@ -105,6 +74,7 @@
 	}
 }
 
+
 variant docs {
 	depends_run-append bin:doxygen:doxygen	
 	configure.args-append --with-apidocs

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070619/725f982b/attachment.html