| 1 |
commit: 6d9dda3defdbfa4c15b0b3b59f9e8548766d92d9 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 26 13:15:31 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 26 13:15:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6d9dda3d |
| 7 |
|
| 8 |
app-text/enscript: drop ~m68k-mint, cleanup |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
app-text/enscript/Manifest | 4 - |
| 14 |
app-text/enscript/enscript-1.6.4-r4.ebuild | 56 ------ |
| 15 |
app-text/enscript/enscript-1.6.5.1.ebuild | 52 ----- |
| 16 |
app-text/enscript/enscript-1.6.5.2-r1.ebuild | 53 ------ |
| 17 |
app-text/enscript/enscript-1.6.5.2.ebuild | 52 ----- |
| 18 |
app-text/enscript/enscript-1.6.5.ebuild | 52 ----- |
| 19 |
app-text/enscript/enscript-1.6.6.ebuild | 4 +- |
| 20 |
.../enscript/files/enscript-1.6.3-language.patch | 11 -- |
| 21 |
.../enscript/files/enscript-1.6.3-security.patch | 177 ----------------- |
| 22 |
...nscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch | 91 --------- |
| 23 |
.../enscript/files/enscript-1.6.4-config.patch | 95 --------- |
| 24 |
app-text/enscript/files/enscript-catmur.patch | 26 --- |
| 25 |
app-text/enscript/files/ruby.st | 212 --------------------- |
| 26 |
13 files changed, 2 insertions(+), 883 deletions(-) |
| 27 |
|
| 28 |
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest |
| 29 |
index ec6163f87e..b5dc1665c3 100644 |
| 30 |
--- a/app-text/enscript/Manifest |
| 31 |
+++ b/app-text/enscript/Manifest |
| 32 |
@@ -1,5 +1 @@ |
| 33 |
-DIST enscript-1.6.4.tar.gz 1036734 BLAKE2B 1eeef021d3feef958c913b1092bdc4ef4d3b8cfc5234593663031ddc1b6e4090a66b41eb4d5c53df0abd0c01b29dad845a72d68c6411d702ceb4ec9cb0e7e6bb SHA512 bd1a2e74e7434ef19c24cab35ab6fb460c593317d4f78161e17632c19bfb800229742def3c9785017b6343621208fca308c1a24a26c03c306ef1698ed7c02d94 |
| 34 |
-DIST enscript-1.6.5.1.tar.gz 1314983 BLAKE2B 9b42eee6de54c1bf890d7354d44b35bb51875ad74ff80131c98e2db6d709bf96335a749bf42b6db83056ce051d35093add2b891e0171408c11435f9f26082f97 SHA512 86163472abbd6ac9e84b4b6ca4048855ff2a91f41bfb1b59b9d962927d10799d2bf73db1f8f5e5ec53876191b56cb21ff18c076f4a9873f552cb507332c85db4 |
| 35 |
-DIST enscript-1.6.5.2.tar.gz 1318283 BLAKE2B 32f6e3150fee0ea6cf04fee8245663e8d8ddb2ab8308269bf334426af340ef5539b44050402a0dd4d4948c3bbaaf59fd9556e4221212480509664c5e7cc02f09 SHA512 8e0ecb95fb4fed79bc82094c86dfc449d429581511840cc68b8e3dd1c04a532adf9ccbd1fe6f325b3b5df8192311c69a294a6367c8891c60a70698cd037038e1 |
| 36 |
-DIST enscript-1.6.5.tar.gz 1308918 BLAKE2B 8d421f564e220bd771d2ae80b140a7237b0e21ee71ad44ddf0df14623ecc2b8824b45058883e96f426aed4689af2b321cf521c4eadc38f3937f862c8feb5a251 SHA512 310c4d9a3e9791a290dde875798d6f0dd6ddadc87f95e249aa90ab8e0263a8396128e13b6a854925dd3369153817967bfedfe12df4407527f2d8c6c21ba138d5 |
| 37 |
DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc |
| 38 |
|
| 39 |
diff --git a/app-text/enscript/enscript-1.6.4-r4.ebuild b/app-text/enscript/enscript-1.6.4-r4.ebuild |
| 40 |
deleted file mode 100644 |
| 41 |
index 29cea57491..0000000000 |
| 42 |
--- a/app-text/enscript/enscript-1.6.4-r4.ebuild |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,56 +0,0 @@ |
| 45 |
-# Copyright 1999-2008 Gentoo Foundation |
| 46 |
-# Distributed under the terms of the GNU General Public License v2 |
| 47 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.4-r4.ebuild,v 1.7 2008/11/15 18:44:05 dertobi123 Exp $ |
| 48 |
- |
| 49 |
-inherit eutils |
| 50 |
- |
| 51 |
-DESCRIPTION="powerful text-to-postscript converter" |
| 52 |
-SRC_URI="http://www.iki.fi/mtr/genscript/${P}.tar.gz" |
| 53 |
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html" |
| 54 |
- |
| 55 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
| 56 |
-SLOT="0" |
| 57 |
-LICENSE="GPL-2" |
| 58 |
-IUSE="nls ruby" |
| 59 |
- |
| 60 |
-DEPEND="sys-devel/flex |
| 61 |
- sys-devel/bison |
| 62 |
- nls? ( sys-devel/gettext )" |
| 63 |
-RDEPEND="nls? ( virtual/libintl )" |
| 64 |
- |
| 65 |
-src_unpack() { |
| 66 |
- unpack ${A} |
| 67 |
- cd "${S}" |
| 68 |
- epatch "${FILESDIR}"/enscript-1.6.3-security.patch |
| 69 |
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch |
| 70 |
- epatch "${FILESDIR}"/enscript-catmur.patch |
| 71 |
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch |
| 72 |
- epatch "${FILESDIR}"/enscript-1.6.4-config.patch |
| 73 |
- epatch "${FILESDIR}"/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch |
| 74 |
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch |
| 75 |
- epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch |
| 76 |
-} |
| 77 |
- |
| 78 |
-src_compile() { |
| 79 |
- unset CC |
| 80 |
- econf $(use_enable nls) |
| 81 |
- emake || die "emake failed" |
| 82 |
-} |
| 83 |
- |
| 84 |
-src_install() { |
| 85 |
- emake DESTDIR="${D}" install || die "install failed" |
| 86 |
- |
| 87 |
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" |
| 88 |
- |
| 89 |
- insinto /usr/share/enscript/hl |
| 90 |
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" |
| 91 |
- |
| 92 |
- if use ruby ; then |
| 93 |
- insinto /usr/share/enscript/hl |
| 94 |
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" |
| 95 |
- fi |
| 96 |
-} |
| 97 |
- |
| 98 |
-pkg_postinst() { |
| 99 |
- elog "Now, customize /etc/enscript.cfg." |
| 100 |
-} |
| 101 |
|
| 102 |
diff --git a/app-text/enscript/enscript-1.6.5.1.ebuild b/app-text/enscript/enscript-1.6.5.1.ebuild |
| 103 |
deleted file mode 100644 |
| 104 |
index 8eabb3905f..0000000000 |
| 105 |
--- a/app-text/enscript/enscript-1.6.5.1.ebuild |
| 106 |
+++ /dev/null |
| 107 |
@@ -1,52 +0,0 @@ |
| 108 |
-# Copyright 1999-2010 Gentoo Foundation |
| 109 |
-# Distributed under the terms of the GNU General Public License v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.1.ebuild,v 1.1 2010/03/09 18:09:11 jer Exp $ |
| 111 |
- |
| 112 |
-EAPI="2" |
| 113 |
- |
| 114 |
-inherit eutils |
| 115 |
- |
| 116 |
-DESCRIPTION="powerful text-to-postscript converter" |
| 117 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
| 118 |
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html" |
| 119 |
- |
| 120 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
| 121 |
-SLOT="0" |
| 122 |
-LICENSE="GPL-3" |
| 123 |
-IUSE="nls ruby" |
| 124 |
- |
| 125 |
-DEPEND=" |
| 126 |
- sys-devel/flex |
| 127 |
- sys-devel/bison |
| 128 |
- nls? ( sys-devel/gettext ) |
| 129 |
-" |
| 130 |
-RDEPEND="nls? ( virtual/libintl )" |
| 131 |
- |
| 132 |
-src_prepare() { |
| 133 |
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch |
| 134 |
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch |
| 135 |
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch |
| 136 |
- epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch |
| 137 |
-} |
| 138 |
- |
| 139 |
-src_configure() { |
| 140 |
- econf $(use_enable nls) |
| 141 |
-} |
| 142 |
- |
| 143 |
-src_install() { |
| 144 |
- emake DESTDIR="${D}" install || die "install failed" |
| 145 |
- |
| 146 |
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" |
| 147 |
- |
| 148 |
- insinto /usr/share/enscript/hl |
| 149 |
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" |
| 150 |
- |
| 151 |
- if use ruby ; then |
| 152 |
- insinto /usr/share/enscript/hl |
| 153 |
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" |
| 154 |
- fi |
| 155 |
-} |
| 156 |
- |
| 157 |
-pkg_postinst() { |
| 158 |
- elog "Now, customize /etc/enscript.cfg." |
| 159 |
-} |
| 160 |
|
| 161 |
diff --git a/app-text/enscript/enscript-1.6.5.2-r1.ebuild b/app-text/enscript/enscript-1.6.5.2-r1.ebuild |
| 162 |
deleted file mode 100644 |
| 163 |
index 58fdf54f3a..0000000000 |
| 164 |
--- a/app-text/enscript/enscript-1.6.5.2-r1.ebuild |
| 165 |
+++ /dev/null |
| 166 |
@@ -1,53 +0,0 @@ |
| 167 |
-# Copyright 1999-2012 Gentoo Foundation |
| 168 |
-# Distributed under the terms of the GNU General Public License v2 |
| 169 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.7 2012/09/30 17:35:03 armin76 Exp $ |
| 170 |
- |
| 171 |
-EAPI="2" |
| 172 |
- |
| 173 |
-inherit eutils |
| 174 |
- |
| 175 |
-DESCRIPTION="powerful text-to-postscript converter" |
| 176 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
| 177 |
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html" |
| 178 |
- |
| 179 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
| 180 |
-SLOT="0" |
| 181 |
-LICENSE="GPL-3" |
| 182 |
-IUSE="nls ruby" |
| 183 |
- |
| 184 |
-DEPEND=" |
| 185 |
- sys-devel/flex |
| 186 |
- sys-devel/bison |
| 187 |
- nls? ( sys-devel/gettext ) |
| 188 |
-" |
| 189 |
-RDEPEND="nls? ( virtual/libintl )" |
| 190 |
- |
| 191 |
-src_prepare() { |
| 192 |
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch |
| 193 |
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch |
| 194 |
- epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch |
| 195 |
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch |
| 196 |
- epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch |
| 197 |
-} |
| 198 |
- |
| 199 |
-src_configure() { |
| 200 |
- econf $(use_enable nls) |
| 201 |
-} |
| 202 |
- |
| 203 |
-src_install() { |
| 204 |
- emake DESTDIR="${D}" install || die "install failed" |
| 205 |
- |
| 206 |
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" |
| 207 |
- |
| 208 |
- insinto /usr/share/enscript/hl |
| 209 |
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" |
| 210 |
- |
| 211 |
- if use ruby ; then |
| 212 |
- insinto /usr/share/enscript/hl |
| 213 |
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" |
| 214 |
- fi |
| 215 |
-} |
| 216 |
- |
| 217 |
-pkg_postinst() { |
| 218 |
- elog "Now, customize /etc/enscript.cfg." |
| 219 |
-} |
| 220 |
|
| 221 |
diff --git a/app-text/enscript/enscript-1.6.5.2.ebuild b/app-text/enscript/enscript-1.6.5.2.ebuild |
| 222 |
deleted file mode 100644 |
| 223 |
index 465f808257..0000000000 |
| 224 |
--- a/app-text/enscript/enscript-1.6.5.2.ebuild |
| 225 |
+++ /dev/null |
| 226 |
@@ -1,52 +0,0 @@ |
| 227 |
-# Copyright 1999-2010 Gentoo Foundation |
| 228 |
-# Distributed under the terms of the GNU General Public License v2 |
| 229 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2.ebuild,v 1.1 2010/06/10 16:01:47 jer Exp $ |
| 230 |
- |
| 231 |
-EAPI="2" |
| 232 |
- |
| 233 |
-inherit eutils |
| 234 |
- |
| 235 |
-DESCRIPTION="powerful text-to-postscript converter" |
| 236 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
| 237 |
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html" |
| 238 |
- |
| 239 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
| 240 |
-SLOT="0" |
| 241 |
-LICENSE="GPL-3" |
| 242 |
-IUSE="nls ruby" |
| 243 |
- |
| 244 |
-DEPEND=" |
| 245 |
- sys-devel/flex |
| 246 |
- sys-devel/bison |
| 247 |
- nls? ( sys-devel/gettext ) |
| 248 |
-" |
| 249 |
-RDEPEND="nls? ( virtual/libintl )" |
| 250 |
- |
| 251 |
-src_prepare() { |
| 252 |
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch |
| 253 |
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch |
| 254 |
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch |
| 255 |
- epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch |
| 256 |
-} |
| 257 |
- |
| 258 |
-src_configure() { |
| 259 |
- econf $(use_enable nls) |
| 260 |
-} |
| 261 |
- |
| 262 |
-src_install() { |
| 263 |
- emake DESTDIR="${D}" install || die "install failed" |
| 264 |
- |
| 265 |
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" |
| 266 |
- |
| 267 |
- insinto /usr/share/enscript/hl |
| 268 |
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" |
| 269 |
- |
| 270 |
- if use ruby ; then |
| 271 |
- insinto /usr/share/enscript/hl |
| 272 |
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" |
| 273 |
- fi |
| 274 |
-} |
| 275 |
- |
| 276 |
-pkg_postinst() { |
| 277 |
- elog "Now, customize /etc/enscript.cfg." |
| 278 |
-} |
| 279 |
|
| 280 |
diff --git a/app-text/enscript/enscript-1.6.5.ebuild b/app-text/enscript/enscript-1.6.5.ebuild |
| 281 |
deleted file mode 100644 |
| 282 |
index 981e46529d..0000000000 |
| 283 |
--- a/app-text/enscript/enscript-1.6.5.ebuild |
| 284 |
+++ /dev/null |
| 285 |
@@ -1,52 +0,0 @@ |
| 286 |
-# Copyright 1999-2010 Gentoo Foundation |
| 287 |
-# Distributed under the terms of the GNU General Public License v2 |
| 288 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.ebuild,v 1.1 2010/01/26 05:08:23 jer Exp $ |
| 289 |
- |
| 290 |
-EAPI="2" |
| 291 |
- |
| 292 |
-inherit eutils |
| 293 |
- |
| 294 |
-DESCRIPTION="powerful text-to-postscript converter" |
| 295 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
| 296 |
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html" |
| 297 |
- |
| 298 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
| 299 |
-SLOT="0" |
| 300 |
-LICENSE="GPL-3" |
| 301 |
-IUSE="nls ruby" |
| 302 |
- |
| 303 |
-DEPEND=" |
| 304 |
- sys-devel/flex |
| 305 |
- sys-devel/bison |
| 306 |
- nls? ( sys-devel/gettext ) |
| 307 |
-" |
| 308 |
-RDEPEND="nls? ( virtual/libintl )" |
| 309 |
- |
| 310 |
-src_prepare() { |
| 311 |
- epatch "${FILESDIR}"/enscript-1.6.3-language.patch |
| 312 |
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch |
| 313 |
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch |
| 314 |
- epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch |
| 315 |
-} |
| 316 |
- |
| 317 |
-src_configure() { |
| 318 |
- econf $(use_enable nls) |
| 319 |
-} |
| 320 |
- |
| 321 |
-src_install() { |
| 322 |
- emake DESTDIR="${D}" install || die "install failed" |
| 323 |
- |
| 324 |
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" |
| 325 |
- |
| 326 |
- insinto /usr/share/enscript/hl |
| 327 |
- doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" |
| 328 |
- |
| 329 |
- if use ruby ; then |
| 330 |
- insinto /usr/share/enscript/hl |
| 331 |
- doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" |
| 332 |
- fi |
| 333 |
-} |
| 334 |
- |
| 335 |
-pkg_postinst() { |
| 336 |
- elog "Now, customize /etc/enscript.cfg." |
| 337 |
-} |
| 338 |
|
| 339 |
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild |
| 340 |
index d848e733d9..7386c36588 100644 |
| 341 |
--- a/app-text/enscript/enscript-1.6.6.ebuild |
| 342 |
+++ b/app-text/enscript/enscript-1.6.6.ebuild |
| 343 |
@@ -1,4 +1,4 @@ |
| 344 |
-# Copyright 1999-2013 Gentoo Foundation |
| 345 |
+# Copyright 1999-2020 Gentoo Authors |
| 346 |
# Distributed under the terms of the GNU General Public License v2 |
| 347 |
# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.6.ebuild,v 1.1 2012/09/26 14:27:26 jer Exp $ |
| 348 |
|
| 349 |
@@ -10,7 +10,7 @@ DESCRIPTION="powerful text-to-postscript converter" |
| 350 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
| 351 |
HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html" |
| 352 |
|
| 353 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris" |
| 354 |
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
| 355 |
SLOT="0" |
| 356 |
LICENSE="GPL-3" |
| 357 |
IUSE="nls ruby" |
| 358 |
|
| 359 |
diff --git a/app-text/enscript/files/enscript-1.6.3-language.patch b/app-text/enscript/files/enscript-1.6.3-language.patch |
| 360 |
deleted file mode 100644 |
| 361 |
index 66ac8cbc3c..0000000000 |
| 362 |
--- a/app-text/enscript/files/enscript-1.6.3-language.patch |
| 363 |
+++ /dev/null |
| 364 |
@@ -1,11 +0,0 @@ |
| 365 |
---- src/main.c.org 2005-06-01 01:23:29.000000000 +0200 |
| 366 |
-+++ src/main.c 2005-06-01 01:26:38.000000000 +0200 |
| 367 |
-@@ -2001,7 +2001,7 @@ |
| 368 |
- int i; |
| 369 |
- |
| 370 |
- c = getopt_long (argc, argv, |
| 371 |
-- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ", |
| 372 |
-+ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ", |
| 373 |
- long_options, &option_index); |
| 374 |
- |
| 375 |
- if (c == -1) |
| 376 |
|
| 377 |
diff --git a/app-text/enscript/files/enscript-1.6.3-security.patch b/app-text/enscript/files/enscript-1.6.3-security.patch |
| 378 |
deleted file mode 100644 |
| 379 |
index de67593f5e..0000000000 |
| 380 |
--- a/app-text/enscript/files/enscript-1.6.3-security.patch |
| 381 |
+++ /dev/null |
| 382 |
@@ -1,177 +0,0 @@ |
| 383 |
-diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/gsint.h enscript-1.6.3.CAN-2004-1184/src/gsint.h |
| 384 |
---- orig/enscript-1.6.3/src/gsint.h 2000-07-11 17:28:06.000000000 +0200 |
| 385 |
-+++ enscript-1.6.3.CAN-2004-1184/src/gsint.h 2005-01-04 20:45:24.000000000 +0100 |
| 386 |
-@@ -701,4 +701,9 @@ FILE *printer_open ___P ((char *cmd, cha |
| 387 |
- */ |
| 388 |
- void printer_close ___P ((void *context)); |
| 389 |
- |
| 390 |
-+/* |
| 391 |
-+ * Escape filenames for shell usage |
| 392 |
-+ */ |
| 393 |
-+char *shell_escape ___P ((const char *fn)); |
| 394 |
-+ |
| 395 |
- #endif /* not GSINT_H */ |
| 396 |
-diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/main.c enscript-1.6.3.CAN-2004-1184/src/main.c |
| 397 |
---- orig/enscript-1.6.3/src/main.c 2005-01-04 20:52:31.000000000 +0100 |
| 398 |
-+++ enscript-1.6.3.CAN-2004-1184/src/main.c 2005-01-05 10:57:44.000000000 +0100 |
| 399 |
-@@ -1555,9 +1555,13 @@ name width\theight\tllx\tlly |
| 400 |
- buffer_append (&cmd, intbuf); |
| 401 |
- buffer_append (&cmd, " "); |
| 402 |
- |
| 403 |
-- buffer_append (&cmd, "-Ddocument_title=\""); |
| 404 |
-- buffer_append (&cmd, title); |
| 405 |
-- buffer_append (&cmd, "\" "); |
| 406 |
-+ buffer_append (&cmd, "-Ddocument_title=\'"); |
| 407 |
-+ if ((cp = shell_escape (title)) != NULL) |
| 408 |
-+ { |
| 409 |
-+ buffer_append (&cmd, cp); |
| 410 |
-+ free (cp); |
| 411 |
-+ } |
| 412 |
-+ buffer_append (&cmd, "\' "); |
| 413 |
- |
| 414 |
- buffer_append (&cmd, "-Dtoc="); |
| 415 |
- buffer_append (&cmd, toc ? "1" : "0"); |
| 416 |
-@@ -1574,8 +1578,14 @@ name width\theight\tllx\tlly |
| 417 |
- /* Append input files. */ |
| 418 |
- for (i = optind; i < argc; i++) |
| 419 |
- { |
| 420 |
-- buffer_append (&cmd, " "); |
| 421 |
-- buffer_append (&cmd, argv[i]); |
| 422 |
-+ char *cp; |
| 423 |
-+ if ((cp = shell_escape (argv[i])) != NULL) |
| 424 |
-+ { |
| 425 |
-+ buffer_append (&cmd, " \'"); |
| 426 |
-+ buffer_append (&cmd, cp); |
| 427 |
-+ buffer_append (&cmd, "\'"); |
| 428 |
-+ free (cp); |
| 429 |
-+ } |
| 430 |
- } |
| 431 |
- |
| 432 |
- /* And do the job. */ |
| 433 |
-@@ -1636,7 +1645,7 @@ name width\theight\tllx\tlly |
| 434 |
- buffer_ptr (opts), buffer_len (opts)); |
| 435 |
- } |
| 436 |
- |
| 437 |
-- buffer_append (&buffer, " \"%s\""); |
| 438 |
-+ buffer_append (&buffer, " \'%s\'"); |
| 439 |
- |
| 440 |
- input_filter = buffer_copy (&buffer); |
| 441 |
- input_filter_stdin = "-"; |
| 442 |
-diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/util.c enscript-1.6.3.CAN-2004-1184/src/util.c |
| 443 |
---- orig/enscript-1.6.3/src/util.c 1999-09-17 17:26:51.000000000 +0200 |
| 444 |
-+++ enscript-1.6.3.CAN-2004-1184/src/util.c 2005-01-05 10:43:23.000000000 +0100 |
| 445 |
-@@ -1239,6 +1239,8 @@ escape_string (char *string) |
| 446 |
- |
| 447 |
- /* Create result. */ |
| 448 |
- cp = xmalloc (len + 1); |
| 449 |
-+ if (cp == NULL) |
| 450 |
-+ return NULL; |
| 451 |
- for (i = 0, j = 0; string[i]; i++) |
| 452 |
- switch (string[i]) |
| 453 |
- { |
| 454 |
-@@ -1879,6 +1881,7 @@ is_open (InputStream *is, FILE *fp, char |
| 455 |
- char *cmd = NULL; |
| 456 |
- int cmdlen; |
| 457 |
- int i, pos; |
| 458 |
-+ char *cp; |
| 459 |
- |
| 460 |
- is->is_pipe = 1; |
| 461 |
- |
| 462 |
-@@ -1902,12 +1905,16 @@ is_open (InputStream *is, FILE *fp, char |
| 463 |
- { |
| 464 |
- case 's': |
| 465 |
- /* Expand cmd-buffer. */ |
| 466 |
-- cmdlen += strlen (fname); |
| 467 |
-- cmd = xrealloc (cmd, cmdlen); |
| 468 |
-+ if ((cp = shell_escape (fname)) != NULL) |
| 469 |
-+ { |
| 470 |
-+ cmdlen += strlen (cp); |
| 471 |
-+ cmd = xrealloc (cmd, cmdlen); |
| 472 |
- |
| 473 |
-- /* Paste filename. */ |
| 474 |
-- strcpy (cmd + pos, fname); |
| 475 |
-- pos += strlen (fname); |
| 476 |
-+ /* Paste filename. */ |
| 477 |
-+ strcpy (cmd + pos, cp); |
| 478 |
-+ pos += strlen (cp); |
| 479 |
-+ free (cp); |
| 480 |
-+ } |
| 481 |
- |
| 482 |
- i++; |
| 483 |
- break; |
| 484 |
-@@ -2116,3 +2123,36 @@ buffer_len (Buffer *buffer) |
| 485 |
- { |
| 486 |
- return buffer->len; |
| 487 |
- } |
| 488 |
-+ |
| 489 |
-+/* |
| 490 |
-+ * Escapes the name of a file so that the shell groks it in 'single' |
| 491 |
-+ * quotation marks. The resulting pointer has to be free()ed when not |
| 492 |
-+ * longer used. |
| 493 |
-+*/ |
| 494 |
-+char * |
| 495 |
-+shell_escape(const char *fn) |
| 496 |
-+{ |
| 497 |
-+ size_t len = 0; |
| 498 |
-+ const char *inp; |
| 499 |
-+ char *retval, *outp; |
| 500 |
-+ |
| 501 |
-+ for(inp = fn; *inp; ++inp) |
| 502 |
-+ switch(*inp) |
| 503 |
-+ { |
| 504 |
-+ case '\'': len += 4; break; |
| 505 |
-+ default: len += 1; break; |
| 506 |
-+ } |
| 507 |
-+ |
| 508 |
-+ outp = retval = malloc(len + 1); |
| 509 |
-+ if(!outp) |
| 510 |
-+ return NULL; /* perhaps one should do better error handling here */ |
| 511 |
-+ for(inp = fn; *inp; ++inp) |
| 512 |
-+ switch(*inp) |
| 513 |
-+ { |
| 514 |
-+ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break; |
| 515 |
-+ default: *outp++ = *inp; break; |
| 516 |
-+ } |
| 517 |
-+ *outp = 0; |
| 518 |
-+ |
| 519 |
-+ return retval; |
| 520 |
-+} |
| 521 |
-diff -u -p -Nr --exclude CVS enscript-1.6.3.CAN-2004-1184/src/psgen.c enscript-1.6.3.CAN-2004-1185/src/psgen.c |
| 522 |
---- enscript-1.6.3.CAN-2004-1184/src/psgen.c 2005-01-04 20:59:56.000000000 +0100 |
| 523 |
-+++ enscript-1.6.3.CAN-2004-1185/src/psgen.c 2005-01-05 15:22:40.000000000 +0100 |
| 524 |
-@@ -2385,9 +2385,10 @@ recognize_eps_file (Token *token) |
| 525 |
- MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename)); |
| 526 |
- |
| 527 |
- i = strlen (token->u.epsf.filename); |
| 528 |
-+ /* |
| 529 |
- if (i > 0 && token->u.epsf.filename[i - 1] == '|') |
| 530 |
- { |
| 531 |
-- /* Read EPS data from pipe. */ |
| 532 |
-+ / * Read EPS data from pipe. * / |
| 533 |
- token->u.epsf.pipe = 1; |
| 534 |
- token->u.epsf.filename[i - 1] = '\0'; |
| 535 |
- token->u.epsf.fp = popen (token->u.epsf.filename, "r"); |
| 536 |
-@@ -2400,6 +2401,7 @@ recognize_eps_file (Token *token) |
| 537 |
- } |
| 538 |
- } |
| 539 |
- else |
| 540 |
-+ */ |
| 541 |
- { |
| 542 |
- char *filename; |
| 543 |
- |
| 544 |
-diff -u -p -Nr --exclude CVS enscript-1.6.3.CAN-2004-1185/src/psgen.c enscript-1.6.3.CAN-2004-1186/src/psgen.c |
| 545 |
---- enscript-1.6.3.CAN-2004-1185/src/psgen.c 2005-01-05 15:22:40.000000000 +0100 |
| 546 |
-+++ enscript-1.6.3.CAN-2004-1186/src/psgen.c 2005-01-05 15:22:44.000000000 +0100 |
| 547 |
-@@ -2034,8 +2034,9 @@ dump_ps_page_header (char *fname, int em |
| 548 |
- else |
| 549 |
- { |
| 550 |
- ftail++; |
| 551 |
-- strncpy (buf, fname, ftail - fname); |
| 552 |
-- buf[ftail - fname] = '\0'; |
| 553 |
-+ i = ftail - fname >= sizeof (buf)-1 ? sizeof (buf)-1 : ftail - fname; |
| 554 |
-+ strncpy (buf, fname, i); |
| 555 |
-+ buf[i] = '\0'; |
| 556 |
- } |
| 557 |
- |
| 558 |
- if (nup > 1) |
| 559 |
- |
| 560 |
|
| 561 |
diff --git a/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch b/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch |
| 562 |
deleted file mode 100644 |
| 563 |
index 2ee926b107..0000000000 |
| 564 |
--- a/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch |
| 565 |
+++ /dev/null |
| 566 |
@@ -1,91 +0,0 @@ |
| 567 |
---- src/psgen.c |
| 568 |
-+++ src/psgen.c 2008-10-29 10:43:08.512598143 +0100 |
| 569 |
-@@ -24,6 +24,7 @@ |
| 570 |
- * Boston, MA 02111-1307, USA. |
| 571 |
- */ |
| 572 |
- |
| 573 |
-+#include <limits.h> |
| 574 |
- #include "gsint.h" |
| 575 |
- |
| 576 |
- /* |
| 577 |
-@@ -124,7 +125,7 @@ struct gs_token_st |
| 578 |
- double xscale; |
| 579 |
- double yscale; |
| 580 |
- int llx, lly, urx, ury; /* Bounding box. */ |
| 581 |
-- char filename[512]; |
| 582 |
-+ char filename[PATH_MAX]; |
| 583 |
- char *skipbuf; |
| 584 |
- unsigned int skipbuf_len; |
| 585 |
- unsigned int skipbuf_pos; |
| 586 |
-@@ -135,11 +136,11 @@ struct gs_token_st |
| 587 |
- Color bgcolor; |
| 588 |
- struct |
| 589 |
- { |
| 590 |
-- char name[512]; |
| 591 |
-+ char name[PATH_MAX]; |
| 592 |
- FontPoint size; |
| 593 |
- InputEncoding encoding; |
| 594 |
- } font; |
| 595 |
-- char filename[512]; |
| 596 |
-+ char filename[PATH_MAX]; |
| 597 |
- } u; |
| 598 |
- }; |
| 599 |
- |
| 600 |
-@@ -248,7 +249,7 @@ static int do_print = 1; |
| 601 |
- static int user_fontp = 0; |
| 602 |
- |
| 603 |
- /* The user ^@font{}-defined font. */ |
| 604 |
--static char user_font_name[256]; |
| 605 |
-+static char user_font_name[PATH_MAX]; |
| 606 |
- static FontPoint user_font_pt; |
| 607 |
- static InputEncoding user_font_encoding; |
| 608 |
- |
| 609 |
-@@ -978,7 +979,8 @@ large for page\n"), |
| 610 |
- FATAL ((stderr, |
| 611 |
- _("user font encoding can be only the system's default or `ps'"))); |
| 612 |
- |
| 613 |
-- strcpy (user_font_name, token.u.font.name); |
| 614 |
-+ memset (user_font_name, 0, sizeof(user_font_name)); |
| 615 |
-+ strncpy (user_font_name, token.u.font.name, sizeof(user_font_name) - 1); |
| 616 |
- user_font_pt.w = token.u.font.size.w; |
| 617 |
- user_font_pt.h = token.u.font.size.h; |
| 618 |
- user_font_encoding = token.u.font.encoding; |
| 619 |
-@@ -1444,7 +1446,7 @@ read_special_escape (InputStream *is, To |
| 620 |
- buf[i] = ch; |
| 621 |
- if (i + 1 >= sizeof (buf)) |
| 622 |
- FATAL ((stderr, _("too long argument for %s escape:\n%.*s"), |
| 623 |
-- escapes[i].name, i, buf)); |
| 624 |
-+ escapes[e].name, i, buf)); |
| 625 |
- } |
| 626 |
- buf[i] = '\0'; |
| 627 |
- |
| 628 |
-@@ -1452,7 +1454,8 @@ read_special_escape (InputStream *is, To |
| 629 |
- switch (escapes[e].escape) |
| 630 |
- { |
| 631 |
- case ESC_FONT: |
| 632 |
-- strcpy (token->u.font.name, buf); |
| 633 |
-+ memset (token->u.font.name, 0, sizeof(token->u.font.name)); |
| 634 |
-+ strncpy (token->u.font.name, buf, sizeof(token->u.font.name) - 1); |
| 635 |
- |
| 636 |
- /* Check for the default font. */ |
| 637 |
- if (strcmp (token->u.font.name, "default") == 0) |
| 638 |
-@@ -1465,7 +1468,8 @@ read_special_escape (InputStream *is, To |
| 639 |
- FATAL ((stderr, _("malformed font spec for ^@font escape: %s"), |
| 640 |
- token->u.font.name)); |
| 641 |
- |
| 642 |
-- strcpy (token->u.font.name, cp); |
| 643 |
-+ memset (token->u.font.name, 0, sizeof(token->u.font.name)); |
| 644 |
-+ strncpy (token->u.font.name, cp, sizeof(token->u.font.name) - 1); |
| 645 |
- xfree (cp); |
| 646 |
- } |
| 647 |
- token->type = tFONT; |
| 648 |
-@@ -1544,7 +1548,8 @@ read_special_escape (InputStream *is, To |
| 649 |
- break; |
| 650 |
- |
| 651 |
- case ESC_SETFILENAME: |
| 652 |
-- strcpy (token->u.filename, buf); |
| 653 |
-+ memset (token->u.filename, 0, sizeof(token->u.font.name)); |
| 654 |
-+ strncpy (token->u.filename, buf, sizeof(token->u.filename) - 1); |
| 655 |
- token->type = tSETFILENAME; |
| 656 |
- break; |
| 657 |
- |
| 658 |
|
| 659 |
diff --git a/app-text/enscript/files/enscript-1.6.4-config.patch b/app-text/enscript/files/enscript-1.6.4-config.patch |
| 660 |
deleted file mode 100644 |
| 661 |
index 5823a9db5e..0000000000 |
| 662 |
--- a/app-text/enscript/files/enscript-1.6.4-config.patch |
| 663 |
+++ /dev/null |
| 664 |
@@ -1,95 +0,0 @@ |
| 665 |
---- enscript-1.6.4/afm/Makefile.am.config 2003-03-05 07:26:16.000000000 +0000 |
| 666 |
-+++ enscript-1.6.4/afm/Makefile.am 2005-12-23 09:56:52.000000000 +0000 |
| 667 |
-@@ -36,11 +36,11 @@ |
| 668 |
- EXTRA_DIST = font.map $(default_afm) $(public_fonts) |
| 669 |
- |
| 670 |
- install-data-local: |
| 671 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript |
| 672 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm |
| 673 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript |
| 674 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm |
| 675 |
- for f in $(EXTRA_DIST); do \ |
| 676 |
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \ |
| 677 |
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \ |
| 678 |
- done |
| 679 |
- |
| 680 |
- uninstall-local: |
| 681 |
-- rm -rf $(datadir)/enscript/afm |
| 682 |
-+ rm -rf $(DESTDIR)/$(datadir)/enscript/afm |
| 683 |
---- enscript-1.6.4/afm/Makefile.in.config 2003-03-05 07:40:06.000000000 +0000 |
| 684 |
-+++ enscript-1.6.4/afm/Makefile.in 2005-12-23 09:56:52.000000000 +0000 |
| 685 |
-@@ -319,14 +319,14 @@ |
| 686 |
- |
| 687 |
- |
| 688 |
- install-data-local: |
| 689 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript |
| 690 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm |
| 691 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript |
| 692 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm |
| 693 |
- for f in $(EXTRA_DIST); do \ |
| 694 |
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \ |
| 695 |
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \ |
| 696 |
- done |
| 697 |
- |
| 698 |
- uninstall-local: |
| 699 |
-- rm -rf $(datadir)/enscript/afm |
| 700 |
-+ rm -rf $(DESTDIR)/$(datadir)/enscript/afm |
| 701 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 702 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
| 703 |
- .NOEXPORT: |
| 704 |
---- enscript-1.6.4/lib/Makefile.in.config 2003-03-05 07:40:07.000000000 +0000 |
| 705 |
-+++ enscript-1.6.4/lib/Makefile.in 2005-12-23 09:56:52.000000000 +0000 |
| 706 |
-@@ -345,15 +345,16 @@ |
| 707 |
- all-local: enscript.cfg |
| 708 |
- |
| 709 |
- install-data-local: enscript.cfg |
| 710 |
-- $(top_srcdir)/mkinstalldirs $(sysconfdir) |
| 711 |
-- if test -r $(sysconfdir)/enscript.cfg; then \ |
| 712 |
-- cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \ |
| 713 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) |
| 714 |
-+ if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \ |
| 715 |
-+ cp $(DESTDIR)$(sysconfdir)/enscript.cfg \ |
| 716 |
-+ $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \ |
| 717 |
- else :; \ |
| 718 |
- fi |
| 719 |
-- $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg |
| 720 |
-+ $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg |
| 721 |
- |
| 722 |
- uninstall-local: |
| 723 |
-- rm -f $(sysconfdir)/enscript.cfg |
| 724 |
-+ rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg |
| 725 |
- |
| 726 |
- enscript.cfg: $(srcdir)/enscript.cfg.in Makefile |
| 727 |
- sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \ |
| 728 |
---- enscript-1.6.4/states/hl/Makefile.am.config 2005-12-23 09:59:55.000000000 +0000 |
| 729 |
-+++ enscript-1.6.4/states/hl/Makefile.am 2005-12-23 10:00:09.000000000 +0000 |
| 730 |
-@@ -45,10 +45,10 @@ |
| 731 |
- EXTRA_DIST = $(states) |
| 732 |
- |
| 733 |
- install-data-local: |
| 734 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript |
| 735 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl |
| 736 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript |
| 737 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl |
| 738 |
- for f in $(states); do \ |
| 739 |
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \ |
| 740 |
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \ |
| 741 |
- done |
| 742 |
- |
| 743 |
- uninstall-local: |
| 744 |
---- enscript-1.6.4/states/hl/Makefile.in.config 2005-12-23 10:00:13.000000000 +0000 |
| 745 |
-+++ enscript-1.6.4/states/hl/Makefile.in 2005-12-23 10:00:34.000000000 +0000 |
| 746 |
-@@ -330,10 +330,10 @@ |
| 747 |
- |
| 748 |
- |
| 749 |
- install-data-local: |
| 750 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript |
| 751 |
-- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl |
| 752 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript |
| 753 |
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl |
| 754 |
- for f in $(states); do \ |
| 755 |
-- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \ |
| 756 |
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \ |
| 757 |
- done |
| 758 |
- |
| 759 |
- uninstall-local: |
| 760 |
|
| 761 |
diff --git a/app-text/enscript/files/enscript-catmur.patch b/app-text/enscript/files/enscript-catmur.patch |
| 762 |
deleted file mode 100644 |
| 763 |
index bd4b222f7f..0000000000 |
| 764 |
--- a/app-text/enscript/files/enscript-catmur.patch |
| 765 |
+++ /dev/null |
| 766 |
@@ -1,26 +0,0 @@ |
| 767 |
---- src/main.c 2005/11/04 11:02:27 1.1 |
| 768 |
-+++ src/main.c 2005/11/04 11:16:28 |
| 769 |
-@@ -1695,7 +1695,7 @@ name width\theight\tllx\tlly |
| 770 |
- } |
| 771 |
- |
| 772 |
- /* Table of Contents. */ |
| 773 |
-- if (toc) |
| 774 |
-+ if (ofp != NULL && toc) |
| 775 |
- { |
| 776 |
- /* This is really cool... */ |
| 777 |
- |
| 778 |
-@@ -1714,9 +1714,11 @@ name width\theight\tllx\tlly |
| 779 |
- process_file (_("Table of Contents"), &is, 1); |
| 780 |
- is_close (&is); |
| 781 |
- } |
| 782 |
-- |
| 783 |
-- /* Clean up toc file. */ |
| 784 |
-- fclose (toc_fp); |
| 785 |
-+ else |
| 786 |
-+ { |
| 787 |
-+ /* Clean up toc file. */ |
| 788 |
-+ fclose (toc_fp); |
| 789 |
-+ } |
| 790 |
- } |
| 791 |
- |
| 792 |
- /* Give trailer a chance to dump itself. */ |
| 793 |
|
| 794 |
diff --git a/app-text/enscript/files/ruby.st b/app-text/enscript/files/ruby.st |
| 795 |
deleted file mode 100644 |
| 796 |
index 392c9c1390..0000000000 |
| 797 |
--- a/app-text/enscript/files/ruby.st |
| 798 |
+++ /dev/null |
| 799 |
@@ -1,212 +0,0 @@ |
| 800 |
-/** |
| 801 |
- * Name: ruby |
| 802 |
- * Description: Ruby programming language. |
| 803 |
- * Author: Mike Wilson <m.v.wilson@××××.com> |
| 804 |
- */ |
| 805 |
- |
| 806 |
-state ruby_comment |
| 807 |
-{ |
| 808 |
- /\*\\\// { |
| 809 |
- language_print ($0); |
| 810 |
- return; |
| 811 |
- } |
| 812 |
- LANGUAGE_SPECIALS { |
| 813 |
- language_print ($0); |
| 814 |
- } |
| 815 |
-} |
| 816 |
- |
| 817 |
-state ruby_dquot_string |
| 818 |
-{ |
| 819 |
- /\\\\./ { |
| 820 |
- language_print ($0); |
| 821 |
- } |
| 822 |
- /\"/ { |
| 823 |
- language_print ($0); |
| 824 |
- return; |
| 825 |
- } |
| 826 |
- LANGUAGE_SPECIALS { |
| 827 |
- language_print ($0); |
| 828 |
- } |
| 829 |
-} |
| 830 |
- |
| 831 |
-state ruby_quot_string |
| 832 |
-{ |
| 833 |
- /\\\\./ { |
| 834 |
- language_print ($0); |
| 835 |
- } |
| 836 |
- /[\']/ { |
| 837 |
- language_print ($0); |
| 838 |
- return; |
| 839 |
- } |
| 840 |
- LANGUAGE_SPECIALS { |
| 841 |
- language_print ($0); |
| 842 |
- } |
| 843 |
-} |
| 844 |
- |
| 845 |
-state ruby_bquot_string |
| 846 |
-{ |
| 847 |
- /\\\\./ { |
| 848 |
- language_print ($0); |
| 849 |
- } |
| 850 |
- /`/ { |
| 851 |
- language_print ($0); |
| 852 |
- return; |
| 853 |
- } |
| 854 |
- LANGUAGE_SPECIALS { |
| 855 |
- language_print ($0); |
| 856 |
- } |
| 857 |
-} |
| 858 |
- |
| 859 |
-state ruby |
| 860 |
-{ |
| 861 |
- BEGIN { |
| 862 |
- header (); |
| 863 |
- } |
| 864 |
- END { |
| 865 |
- trailer (); |
| 866 |
- } |
| 867 |
- |
| 868 |
- /* Comments. */ |
| 869 |
- /#[^{].*$/ { |
| 870 |
- comment_face (true); |
| 871 |
- language_print ($0); |
| 872 |
- comment_face (false); |
| 873 |
- } |
| 874 |
- |
| 875 |
- /* Ignore escaped quote marks */ |
| 876 |
- /\\\"/ { |
| 877 |
- language_print ($0); |
| 878 |
- } |
| 879 |
- /\\\'/ { |
| 880 |
- language_print ($0); |
| 881 |
- } |
| 882 |
- /\\\`/ { |
| 883 |
- language_print ($0); |
| 884 |
- } |
| 885 |
- |
| 886 |
- /* In cgi files, JavaScript might be imbedded, so we need to look out |
| 887 |
- * for the JavaScript comments, because they might contain something |
| 888 |
- * we don't like, like a contraction (don't, won't, etc.) |
| 889 |
- * We won't put them in comment face, because they are not ruby |
| 890 |
- * comments. |
| 891 |
- */ |
| 892 |
- /\/\// { |
| 893 |
- language_print ($0); |
| 894 |
- call (eat_one_line); |
| 895 |
- } |
| 896 |
- |
| 897 |
- /* String constants. */ |
| 898 |
- /\"/ { |
| 899 |
- string_face (true); |
| 900 |
- language_print ($0); |
| 901 |
- call (ruby_dquot_string); |
| 902 |
- string_face (false); |
| 903 |
- } |
| 904 |
- /[\']/ { |
| 905 |
- string_face (true); |
| 906 |
- language_print ($0); |
| 907 |
- call (ruby_quot_string); |
| 908 |
- string_face (false); |
| 909 |
- } |
| 910 |
- |
| 911 |
- /* Backquoted command string */ |
| 912 |
- /`/ { |
| 913 |
- string_face (true); |
| 914 |
- language_print ($0); |
| 915 |
- call (ruby_bquot_string); |
| 916 |
- string_face (false); |
| 917 |
- } |
| 918 |
- |
| 919 |
- /* Variables globals and instance */ |
| 920 |
- /[$@]\w+/ { |
| 921 |
- variable_name_face (true); |
| 922 |
- language_print ($0); |
| 923 |
- variable_name_face (false); |
| 924 |
- } |
| 925 |
- |
| 926 |
- /* Variables class variable */ |
| 927 |
- /@@\w+/ { |
| 928 |
- variable_name_face (true); |
| 929 |
- language_print ($0); |
| 930 |
- variable_name_face (false); |
| 931 |
- } |
| 932 |
- |
| 933 |
- /([ \t]*)(def)([ \t]+)([^(]*)/ { |
| 934 |
- /* indentation */ |
| 935 |
- language_print ($1); |
| 936 |
- |
| 937 |
- /* def */ |
| 938 |
- keyword_face (true); |
| 939 |
- language_print ($2); |
| 940 |
- keyword_face (false); |
| 941 |
- |
| 942 |
- /* middle */ |
| 943 |
- language_print ($3); |
| 944 |
- |
| 945 |
- /* Function name. */ |
| 946 |
- function_name_face (true); |
| 947 |
- language_print ($4); |
| 948 |
- function_name_face (false); |
| 949 |
- } |
| 950 |
- |
| 951 |
- /\$[!@&`'+~=\/\\,;.<>_*$?:"]/ { |
| 952 |
- variable_name_face (true); |
| 953 |
- language_print ($0); |
| 954 |
- variable_name_face (false); |
| 955 |
- } |
| 956 |
- |
| 957 |
- /* Highlighting |
| 958 |
- --Type face |
| 959 |
- private protected public |
| 960 |
- |
| 961 |
- --Builtin face (I consider these to be somewhat special) |
| 962 |
- alias alias_method attr attr_accessor attr_reader attr_writer |
| 963 |
- module_alias module_function self super |
| 964 |
- |
| 965 |
- --Reference face |
| 966 |
- require include |
| 967 |
- |
| 968 |
- --Keyword face |
| 969 |
- and begin break case class def defined? do else elsif end |
| 970 |
- ensure eval extend false for if in method module next nil not |
| 971 |
- or redo rescue retry return then true undef unless until when |
| 972 |
- while yield |
| 973 |
- */ |
| 974 |
-/\\b(private|protected|public)\\b/ { |
| 975 |
- type_face (true); |
| 976 |
- language_print ($0); |
| 977 |
- type_face (false); |
| 978 |
- } |
| 979 |
- |
| 980 |
-/\\b(alias|alias_method|attr|attr_accessor|attr_reader|attr_writer\\ |
| 981 |
-|module_alias|module_function|self|super)\\b/ { |
| 982 |
- builtin_face (true); |
| 983 |
- language_print ($0); |
| 984 |
- builtin_face (false); |
| 985 |
- } |
| 986 |
- |
| 987 |
-/\\b(include|require)\\b/ { |
| 988 |
- reference_face (true); |
| 989 |
- language_print ($0); |
| 990 |
- reference_face (false); |
| 991 |
- } |
| 992 |
- |
| 993 |
-/\\b(and|begin|break|case|class|def|defined?|do|else|elsif|end|ensure|eval\\ |
| 994 |
-|extend|false|for|if|in|method|module|next|nil|not|or|raise|redo|rescue|retry\\ |
| 995 |
-|return|then|true|undef|unless|until|when|while|yield)\\b/ { |
| 996 |
- keyword_face (true); |
| 997 |
- language_print ($0); |
| 998 |
- keyword_face (false); |
| 999 |
- } |
| 1000 |
- |
| 1001 |
- LANGUAGE_SPECIALS { |
| 1002 |
- language_print ($0); |
| 1003 |
- } |
| 1004 |
-} |
| 1005 |
- |
| 1006 |
- |
| 1007 |
-/* |
| 1008 |
-Local variables: |
| 1009 |
-mode: c |
| 1010 |
-End: |
| 1011 |
-*/ |
Archives