macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

remove the variant-foo from portname

Browse Source 
git-svn-id: https://svn.macports.org/repository/macports/branches/dp_light-olegb/base@17710 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Ole Guldberg Jensen
2006-04-22 20:22:28 +00:00
parent 56f8cdeec2
commit 209bc5889d
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/package1.0/portrpmpackage.tcl
+8 -7
View File
@@ -1,6 +1,6 @@
# et:ts=4
# portrpmpackage.tcl
# $Id: portrpmpackage.tcl,v 1.6.6.5 2006/02/28 19:49:34 olegb Exp $
# $Id: portrpmpackage.tcl,v 1.6.6.6 2006/04/22 20:22:27 olegb Exp $
#
# Copyright (c) 2002 - 2003 Apple Computer, Inc.
# All rights reserved.
@@ -103,7 +103,7 @@ proc rpmpackage_pkg {portname portversion portrevision} {
set pkg_$variable [set $variable]
}
}
set category [lindex [split $categories " "] 0]
set category [lindex [split $categories " "] 0]
set maintainer $maintainers
set dependencies {}
@@ -119,12 +119,13 @@ proc rpmpackage_pkg {portname portversion portrevision} {
}
}
system "rm -f '${workpath}/${portname}${portvariants}.filelist' && touch '${workpath}/${portname}${portvariants}.filelist'"
system "rm -f '${workpath}/${portname}.filelist' && touch '${workpath}/${portname}.filelist'"
#system "cd '${destpath}' && find . -type d | grep -v -E '^.$' | sed -e 's/\"/\\\"/g' -e 's/^./%dir \"/' -e 's/$/\"/' > '${workpath}/${portname}.filelist'"
system "cd '${destpath}' && find . ! -type d | grep -v /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./\"/' -e 's/$/\"/' >> '${workpath}/${portname}${portvariants}.filelist'"
system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config \"/' -e 's/$/\"/' >> '${workpath}/${portname}${portvariants}.filelist'"
system "cd '${destpath}' && find . ! -type d | grep -v /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./\"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config \"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
write_spec ${specpath} $portname $portversion $portrevision $portvariants $pkg_description $pkg_long_description $category $maintainer $destpath $dependencies $epoch
system "DP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmdestpath} ${specpath}"
set time [clock format [clock seconds]]
ui_msg "::${time}::${portname}-${portversion}-${portrevision}${portvariants}:: rpmpackage end."
@@ -168,7 +169,7 @@ proc make_dependency_list {portname} {
proc write_spec {specfile portname portversion portrevision portvariants description long_description category maintainer destroot dependencies epoch} {
set specfd [open ${specfile} w+]
set origportname ${portname}${portvariants}
set origportname ${portname}
regsub -all -- "\-" $portversion "_" portversion
regsub -all -- "\-" $portname "_" portname
puts $specfd "\#Spec file generated by DarwinPorts
@@ -177,7 +178,7 @@ proc write_spec {specfile portname portversion portrevision portvariants descrip
%define packager ${maintainer}
Summary: ${description}
Name: ${portname}${portvariants}
Name: ${portname}
Version: ${portversion}
Release: ${portrevision}
Group: ${category}
src/port1.0/portinstall.tcl
+3 -3
View File
@@ -1,6 +1,6 @@
# et:ts=4
# portinstall.tcl
# $Id: portinstall.tcl,v 1.78.6.25 2006/04/21 14:32:16 olegb Exp $
# $Id: portinstall.tcl,v 1.78.6.26 2006/04/22 20:22:28 olegb Exp $
#
# Copyright (c) 2002 - 2003 Apple Computer, Inc.
# Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -70,7 +70,7 @@ proc install_main {args} {
# Map portname to suit RPM-ification
set rpmportname [string map {- _} $portname]
set rpmportname "$rpmportname$portvariants"
set rpmportname "$rpmportname"
set portversion [string map {- _} $portversion]
set arch [option os.arch]
@@ -107,7 +107,7 @@ proc install_main {args} {
ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]"
set file_url [portfetch::assemble_url $site $distfile]
if {![catch {eval curl fetch {$file_url} ${prefix}/src/apple/RPMS/${arch}/${distfile}.TMP} result] && ![catch {system "mv ${prefix}/src/apple/RPMS/${arch}/${distfile}.TMP ${prefix}/src/apple/RPMS/${arch}/${distfile}"}]} {
if {![catch {eval curl fetch {$file_url} ${prefix}/src/apple/RPMS/${arch}/${distfile}.TMP} result] && ![catch {system "mv ${prefix}/src/apple/RPMS/${arch}/${portvariant}/${distfile}.TMP ${prefix}/src/apple/RPMS/${arch}/${distfile}"}]} {
set fetched 1
break
}