[68927] trunk/dports
jmr at macports.org
jmr at macports.org
Thu Jun 17 19:36:48 PDT 2010
Revision: 68927
http://trac.macports.org/changeset/68927
Author: jmr at macports.org
Date: 2010-06-17 19:36:47 -0700 (Thu, 17 Jun 2010)
Log Message:
-----------
docbook-xml-*, docbook-xsl, xmlroff, font-misc-ethiopic, monafont, mplus-fonts: enable post-deactivate hooks
Modified Paths:
--------------
trunk/dports/textproc/docbook-xml-4.1.2/Portfile
trunk/dports/textproc/docbook-xml-4.2/Portfile
trunk/dports/textproc/docbook-xml-4.3/Portfile
trunk/dports/textproc/docbook-xml-4.4/Portfile
trunk/dports/textproc/docbook-xml-4.5/Portfile
trunk/dports/textproc/docbook-xml-5.0/Portfile
trunk/dports/textproc/docbook-xsl/Portfile
trunk/dports/textproc/xmlroff/Portfile
trunk/dports/x11/font-misc-ethiopic/Portfile
trunk/dports/x11/monafont/Portfile
trunk/dports/x11/mplus-fonts/Portfile
Modified: trunk/dports/textproc/docbook-xml-4.1.2/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-4.1.2/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xml-4.1.2/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -69,25 +69,21 @@
if {[catch {exec xmlcatmgr lookup ${install_dir}/catalog.xml}]} {
system "xmlcatmgr add nextCatalog ${install_dir}/catalog.xml"
}
+}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\"."
- ui_msg \
- "######################################################################"
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\".
+######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
-#}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
+}
livecheck.type none
-
Modified: trunk/dports/textproc/docbook-xml-4.2/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-4.2/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xml-4.2/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -66,25 +66,21 @@
if {[catch {exec xmlcatmgr lookup ${install_dir}/catalog.xml}]} {
system "xmlcatmgr add nextCatalog ${install_dir}/catalog.xml"
}
+}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\"."
- ui_msg \
- "######################################################################"
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\".
+######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
-#}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
+}
livecheck.type none
-
Modified: trunk/dports/textproc/docbook-xml-4.3/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-4.3/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xml-4.3/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -66,25 +66,21 @@
if {[catch {exec xmlcatmgr lookup ${install_dir}/catalog.xml}]} {
system "xmlcatmgr add nextCatalog ${install_dir}/catalog.xml"
}
+}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\"."
- ui_msg \
- "######################################################################"
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\".
+######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
-#}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
+}
livecheck.type none
-
Modified: trunk/dports/textproc/docbook-xml-4.4/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-4.4/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xml-4.4/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -66,25 +66,21 @@
if {[catch {exec xmlcatmgr lookup ${install_dir}/catalog.xml}]} {
system "xmlcatmgr add nextCatalog ${install_dir}/catalog.xml"
}
+}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\"."
- ui_msg \
- "######################################################################"
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\".
+######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
-#}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
+}
livecheck.type none
-
Modified: trunk/dports/textproc/docbook-xml-4.5/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-4.5/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xml-4.5/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -66,25 +66,21 @@
if {[catch {exec xmlcatmgr lookup ${install_dir}/catalog.xml}]} {
system "xmlcatmgr add nextCatalog ${install_dir}/catalog.xml"
}
+}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\"."
- ui_msg \
- "######################################################################"
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml\".
+######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
-#}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${install_dir}/catalog.xml"
+}
livecheck.type none
-
Modified: trunk/dports/textproc/docbook-xml-5.0/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-5.0/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xml-5.0/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -47,4 +47,19 @@
}
}
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${bookdir}/catalog.xml\".
+######################################################################"
+}
+
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${bookdir}/catalog.xml"
+}
+
livecheck.type none
Modified: trunk/dports/textproc/docbook-xsl/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xsl/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/docbook-xsl/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -72,25 +72,22 @@
if {[catch {exec xmlcatmgr lookup ${prefix}/${instxsldir}/catalog.xml}]} {
system "xmlcatmgr add nextCatalog ${prefix}/${instxsldir}/catalog.xml"
}
+}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml\"."
- ui_msg \
- "######################################################################"
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml\".
+######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${prefix}/${instdir}/catalog.xml"
-#}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml"
+}
variant doc description {Install full DocBook XSL documentation} {
distfiles-append [suffix ${name}-doc-${version}]
@@ -98,4 +95,3 @@
}
livecheck.distname ${name}
-
Modified: trunk/dports/textproc/xmlroff/Portfile
===================================================================
--- trunk/dports/textproc/xmlroff/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/textproc/xmlroff/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -56,22 +56,19 @@
if {[catch {exec xmlcatmgr lookup ${libfocatalog}}]} {
system "xmlcatmgr add nextCatalog ${libfocatalog}"
}
- # Once MacPorts does get a post-deactivate hook, this should change to
- # auto-detect whether or not the user's installed version has the hook, and
- # only print the message if it doesn't.
- ui_msg \
- "######################################################################"
- ui_msg "# As MacPorts does not currently have a post-deactivate hook,\
- \n# you will need to ensure that you manually remove the catalog\
- \n# entry for this port when you uninstall it. To do so, run\
- \n# \"xmlcatmgr remove nextCatalog ${libfocatalog}\"."
- ui_msg \
- "######################################################################"
}
-# This will remove the catalog entry for this port once a post-deactivate hook
-# has been implemented.
-#post-deactivate {
-# system "xmlcatmgr remove nextCatalog ${libfocatalog}"
-#}
+if {${registry.format} == "receipt_flat"} {
+ notes \
+"######################################################################
+# As the flat registry format does not support post-deactivate hooks,
+# you will need to ensure that you manually remove the catalog
+# entry for this port when you uninstall it. To do so, run
+# \"xmlcatmgr remove nextCatalog ${libfocatalog}\".
+######################################################################"
+}
+# This will remove the catalog entry for this port.
+post-deactivate {
+ system "xmlcatmgr remove nextCatalog ${libfocatalog}"
+}
Modified: trunk/dports/x11/font-misc-ethiopic/Portfile
===================================================================
--- trunk/dports/x11/font-misc-ethiopic/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/x11/font-misc-ethiopic/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -43,15 +43,13 @@
}
}
-# This should be done when uninstalling, but deactivate doesn't currently work
-#post-deactivate {
-# foreach fontType {OTF TTF} {
-# system "mkfontscale ${myfontbasedir}/${fontType}"
-# system "mkfontdir ${myfontbasedir}/${fontType}"
-# }
-#}
+post-deactivate {
+ foreach fontType {OTF TTF} {
+ system "mkfontscale ${myfontbasedir}/${fontType}"
+ system "mkfontdir ${myfontbasedir}/${fontType}"
+ }
+}
livecheck.type regex
livecheck.regex ${name}-(\[\\d.\]+)${extract.suffix}
livecheck.url ${master_sites}
-
Modified: trunk/dports/x11/monafont/Portfile
===================================================================
--- trunk/dports/x11/monafont/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/x11/monafont/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -34,9 +34,7 @@
system "mkfontdir ${myfontdir}"
}
-# This should be done when uninstalling, but deactivate doesn't currently work
-#post-deactivate {
-# system "mkfontscale ${myfontdir}"
-# system "mkfontdir ${myfontdir}"
-#}
-
+post-deactivate {
+ system "mkfontscale ${myfontdir}"
+ system "mkfontdir ${myfontdir}"
+}
Modified: trunk/dports/x11/mplus-fonts/Portfile
===================================================================
--- trunk/dports/x11/mplus-fonts/Portfile 2010-06-18 02:08:43 UTC (rev 68926)
+++ trunk/dports/x11/mplus-fonts/Portfile 2010-06-18 02:36:47 UTC (rev 68927)
@@ -53,8 +53,7 @@
system "mkfontdir ${prefix}${fontsdir}/mplus"
}
-# This should be done when uninstalling, but deactivate doesn't currently work
-#post-deactivate {
-# system "mkfontscale ${prefix}${fontsdir}/mplus"
-# system "mkfontdir ${prefix}${fontsdir}/mplus"
-#}
+post-deactivate {
+ system "mkfontscale ${prefix}${fontsdir}/mplus"
+ system "mkfontdir ${prefix}${fontsdir}/mplus"
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100617/4026ab69/attachment.html>
More information about the macports-changes
mailing list