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

[source_changes at macosforge.org]

Revision: 26405
          http://trac.macosforge.org/projects/macports/changeset/26405
Author:   jmpp at macports.org
Date:     2007-06-21 06:44:56 -0700 (Thu, 21 Jun 2007)

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

Eval glob delete the popt files in the destroot, port now installs and activates properly, woot!
Also, while at it, use "macports" as the vendor name.

PS: To destroot this port you need to have eridius' r26397 installed, as otherwise the delete command segfaults.
Said fix will be in MacPorts 1.5, of course.

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

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2007-06-21 08:53:47 UTC (rev 26404)
+++ trunk/dports/sysutils/rpm/Portfile	2007-06-21 13:44:56 UTC (rev 26405)
@@ -58,19 +58,19 @@
 	post-destroot {
 		# Delete overlapping files.
 		delete ${destroot}${prefix}/include/popt.h 
-#		delete ${destroot}${prefix}/share/man/man3/popt.3*
-#		delete ${destroot}${prefix}/lib/libpopt.*
+		eval delete [glob ${destroot}${prefix}/share/man/man3/popt.3*]
+		eval delete [glob ${destroot}${prefix}/lib/libpopt.*]
 
-		# MacOSX specific changes
-		reinplace "s;%{_usrsrc}/redhat;%{_usrsrc}/apple;" ${destroot}${prefix}/lib/rpm/macros
+		# MacPorts specific changes
+		reinplace "s;%{_usrsrc}/redhat;%{_usrsrc}/macports;" ${destroot}${prefix}/lib/rpm/macros
 
 		# where the RPM database lives
 		destroot.keepdirs ${destroot}${prefix}/var/lib/rpm\
-				  ${destroot}${prefix}/src/apple/BUILD\
-				  ${destroot}${prefix}/src/apple/RPMS\
-				  ${destroot}${prefix}/src/apple/SOURCES\
-				  ${destroot}${prefix}/src/apple/SPECS\
-				  ${destroot}${prefix}/src/apple/SRPMS
+				  ${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
 	}
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070621/4361e9fd/attachment.html