72-Makefile.patch -> 74-Makefile.patchalpine

3 files changed, 82 insertions, 3 deletions

diff --git a/net-mail/topal/Manifest b/net-mail/topal/Manifest
index 0762f22..f73c93d 100644
--- a/net-mail/topal/Manifest
+++ b/net-mail/topal/Manifest
@@ -1,10 +1,11 @@
 AUX 64-Makefile.patch 2267 RMD160 60348219f8849e3719bf2678da4858c8f8d48dea SHA1 5fb4a4a6d7c08c29324436d1711b5d7151168205 SHA256 8623312f3eea1fa5ad3a41cd434dbe30cee9011eb3ccbdf459692a5d74e4f9a8
 AUX 72-Makefile.patch 2481 RMD160 83f4c210459a581e6e8f10e99ee2d38ee4511dde SHA1 704cc8c8cd9905bb8602fdef2b5d56e5127cd848 SHA256 c824acdda60194bf885733663a6255e03197597cb411f89eecf63cc37ce7baba
+AUX 74-Makefile.patch 2500 RMD160 1f632190090199b58cb75c2d1d823308a93dc5ac SHA1 d80d786e31ff7fe2367440245fd7eda3cb2a9e91 SHA256 7ab4a611fc30d6a583f449c9ba3b17373197f8fd644418d3ee1e69358a5d1ffe
 DIST topal-package-64.tgz 170401 RMD160 69e5bdd0b2956fc4ead3815304d7e4def4f99292 SHA1 e2939bcff099e8d32e30dc1eef025f9b29b1053a SHA256 e44b879a8e8d96d5f0cad9e2b68056ba05fe4267a6f4d2d50325164be3f48cd5
 DIST topal-package-72.tgz 186728 RMD160 80a5493a91fe19f2b92a3e56810035b890cab1fb SHA1 1c05595d6b00db179539620d997c27ef4cf42fd3 SHA256 ccef20b3add7add640931b6de284e90815dade6ddc171b20d35f8d9b3487db52
 DIST topal-package-74.tgz 345208 RMD160 f2bdb06e255a867647b2b2ba872622dcfceee58d SHA1 5a50300faf10169114bd84a1f868f2a976bc7baf SHA256 28215123a1a7298821a9cf16d298dc1e4bb1daed066161c44465c7bf0ed811d7
 EBUILD topal-64.ebuild 1069 RMD160 5f9134dd9152d1b063e6c690788c390ded11c92c SHA1 1a41b0a2d57fd85e0d47b99c779687680982c3fb SHA256 5a83c6fabc3b600b55a0a213f41bcdde45cb85275cf4589c3748c3a4b6bf0983
 EBUILD topal-72.ebuild 1117 RMD160 53feb80355e36d9aaf8ad2c07a1563adba145414 SHA1 2c2717deb70402b1f672dee3272d89e1b1aeb4eb SHA256 74ef8dffb57d629ea404b1f6d01bb8c2075dca25f943b035e0907a4efad1b4ed
-EBUILD topal-74.ebuild 1119 RMD160 5c2173bb7a29ed5648eca4bc2c1b3a4356dd7b5b SHA1 cc6b0e9d29abd43ab07105f0484429c4a4e3f781 SHA256 e17697bfe77fa51c9bd66be025fd3917abe56e4abfd4adb1c64c4798b086edaf
+EBUILD topal-74.ebuild 1146 RMD160 b28aeec719fefd75736840d8bc36740e476b4d32 SHA1 e2228aa938cd743be1ec13506df095702ed6337c SHA256 f311a31e1346f0eaf0e125955917b469ff6c79ec1cd91819046cca61bb3e55b0
 MISC ChangeLog 1367 RMD160 e0e8927aa0b027267d8e40d07b87e5f484c74b1c SHA1 b29c0d80e36acec04512d48030d655a2816dfcfd SHA256 3646e43cf1491c5d632fceb2e4493810057bbe0ba06694199391b8efd5db6db3
 MISC metadata.xml 433 RMD160 91fef629634574556108d901437922eb33de1054 SHA1 b9b7d25e163f9d7324691053f059427aeabfc63d SHA256 20be76d34b7465137697e575336303c4ad625646dec31a1031562c69654aabaf
diff --git a/net-mail/topal/files/74-Makefile.patch b/net-mail/topal/files/74-Makefile.patch
new file mode 100644
index 0000000..44fde09
--- /dev/null
+++ b/net-mail/topal/files/74-Makefile.patch
@@ -0,0 +1,77 @@
+diff -uraN topal-74.orig/Makefile topal-74/Makefile
+--- topal-74.orig/Makefile	2011-06-23 22:55:26.000000000 +0200
++++ topal-74/Makefile	2012-02-20 21:09:31.000000000 +0100
+@@ -15,6 +15,10 @@
+ 
+ .PHONY:	all binary doc clean realclean distclean package install distrib all2 FORCE
+ 
++CC=gcc
++CFLAGS=-Wall -O2
++LDFLAGS=
++
+ RELEASECODE=$(shell grep '^<dt>' Changelog.html | tail -1 | sed 's/.* release //; sx</a>.*$$xx')
+ BUILDDATE=$(shell date '+%Y-%m-%dT%H%M%S%Z')
+ 
+@@ -44,20 +48,19 @@
+ all2:	package distrib
+ 
+ ada-readline-c.o:	ada-readline-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-readline-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-readline-c.c
+ 
+ ada-echo-c.o:	ada-echo-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-echo-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-echo-c.c
+ 
+ externals-c.o:	externals-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) externals-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) externals-c.c
+ 
+ mime-tool:	
+-	make -C MIME-tool
++	$(MAKE) -C MIME-tool
+ 
+ topal:	$(TOPALDEPS)
+-	gnatmake -gnat05 -gnatwa -gnato -O2 $(TOPALDEBUG) topal
+-	-strip topal
++	gnatmake -gnat05 -gnatwa -gnato -O2 $(TOPALDEBUG) topal -largs $(LDFLAGS)
+ 
+ # FORCE, because BUILDDATE changes each time....
+ version_id.adb:	mkversionid FORCE
+@@ -74,13 +77,13 @@
+ topal.pdf:	topal.tex versionid.tex
+ 	pdflatex topal.tex && pdflatex topal.tex
+ 
+-install:	all
++install:
+ 	install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
+-	install -m 755 -s topal $(INSTALLPATHBIN)
++	install -m 755 topal $(INSTALLPATHBIN)
+ 	install -m 644 Features.html Changelog.html topal.pdf COPYING $(INSTALLPATHDOC)
+ 	install -m 644 topal.man $(INSTALLPATHMAN)/man1/topal.1
+-	install -m 644 pine-*.patch alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
+-	install -m 755 -s MIME-tool/mime-tool $(INSTALLPATHBIN)
++	install -m 644 alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
++	install -m 755 MIME-tool/mime-tool $(INSTALLPATHBIN)
+ 	install -m 644 MIME-tool/mime-tool.man $(INSTALLPATHMAN)/man1/mime-tool.1
+ 
+ clean:
+diff -uraN topal-74.orig/MIME-tool/Makefile topal-74/MIME-tool/Makefile
+--- topal-74.orig/MIME-tool/Makefile	2011-06-23 22:55:26.000000000 +0200
++++ topal-74/MIME-tool/Makefile	2012-02-20 21:04:37.000000000 +0100
+@@ -1,10 +1,13 @@
+ .PHONY:	all clean realclean distrib
+ 
++CC=gcc
++CFLAGS=-Wall -O2
++LDFLAGS=
++
+ all:	mime-tool
+ 
+ mime-tool:	mime.c
+-	gcc -Wall -O2 -o mime-tool mime.c
+-	-strip mime-tool
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mime-tool mime.c
+ 
+ realclean:	clean
+ 	-rm mime-tool
diff --git a/net-mail/topal/topal-74.ebuild b/net-mail/topal/topal-74.ebuild
index 4f7a3f0..cd5a15a 100644
--- a/net-mail/topal/topal-74.ebuild
+++ b/net-mail/topal/topal-74.ebuild
@@ -21,7 +21,8 @@ RDEPEND=">=app-crypt/gnupg-2.0.7-r1
 	sys-libs/ncurses
 	sys-libs/readline"
 DEPEND="${RDEPEND}
-	virtual/ada"
+    virtual/latex-base
+	>=virtual/ada-2005"
 
 src_prepare() {
 	rm "${S}"/MIME-tool/mime-tool || die
@@ -37,5 +38,5 @@ src_install() {
 		INSTALLPATH="${D}"/usr \
 		INSTALLPATHDOC="${D}"/usr/share/doc/${PF} \
 			|| die "make install failed"
-	dohtml "${S}"/README.html || die
+	dodoc "${S}"/topal.pdf || die
 }