Update to 0.98

Closes PR:	ports/68496
Submitted by:	Wesley Shields, Yonatan Bokovza (maintainer)

4 files changed, 16 insertions, 45 deletions

diff --git a/security/libtomcrypt/Makefile b/security/libtomcrypt/Makefile
index 1ea316822ab..b253a40191c 100644
--- a/security/libtomcrypt/Makefile
+++ b/security/libtomcrypt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libtomcrypt
-PORTVERSION=	0.94
+PORTVERSION=	0.98
 CATEGORIES=	security
 MASTER_SITES=	http://libtomcrypt.org/files/
 DISTNAME=	crypt-${PORTVERSION}
diff --git a/security/libtomcrypt/distinfo b/security/libtomcrypt/distinfo
index 14c384e400c..428dfc373d4 100644
--- a/security/libtomcrypt/distinfo
+++ b/security/libtomcrypt/distinfo
@@ -1,2 +1,2 @@
-MD5 (crypt-0.94.tar.bz2) = f53f3977e74d63e4733e388bffc69087
-SIZE (crypt-0.94.tar.bz2) = 820131
+MD5 (crypt-0.98.tar.bz2) = 19215f6876671f9fc43e15703088a74a
+SIZE (crypt-0.98.tar.bz2) = 867290
diff --git a/security/libtomcrypt/files/patch-makefile b/security/libtomcrypt/files/patch-makefile
index 02b6cf2e557..4ebf7349518 100644
--- a/security/libtomcrypt/files/patch-makefile
+++ b/security/libtomcrypt/files/patch-makefile
@@ -1,27 +1,21 @@
---- makefile.orig	Wed Dec 24 20:59:55 2003
-+++ makefile	Sat Apr 10 23:01:52 2004
-@@ -52,9 +52,9 @@
+--- makefile.orig	Mon Aug  9 11:52:40 2004
++++ makefile	Mon Aug  9 12:03:56 2004
+@@ -43,10 +43,10 @@
  #LIBPATH-The directory for libtomcrypt to be installed to.
  #INCPATH-The directory to install the header files for libtomcrypt.
  #DATAPATH-The directory to install the pdf docs.
 -DESTDIR=
 -LIBPATH=/usr/lib
 -INCPATH=/usr/include
+-DATAPATH=/usr/share/doc/libtomcrypt/pdf
 +DESTDIR=$(PREFIX)
 +LIBPATH=/lib
 +INCPATH=/include
- DATAPATH=/usr/share/doc/libtomcrypt/pdf
++DATAPATH=/share/doc/libtomcrypt/pdf
  
  #List of objects to compile.
-@@ -106,6 +106,7 @@
  
- #This rule makes the test program included with libtomcrypt
- test: library $(TESTOBJECTS)
-+	mv $(TEST).o demos
- 	$(CC) $(TESTOBJECTS) $(LIBNAME) -o $(TEST) $(WARN)
- 
- #This rule makes the hash program included with libtomcrypt
-@@ -129,13 +130,19 @@
+@@ -179,13 +179,15 @@
  #This rule installs the library and the header files. This must be run
  #as root in order to have a high enough permission to write to the correct
  #directories and to set the owner and group to root.
@@ -31,20 +25,16 @@
 -	install -d -g root -o root $(DESTDIR)$(DATAPATH)
 -	install -g root -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
 -	install -g root -o root $(HEADERS) $(DESTDIR)$(INCPATH)
--	install -g root -o root crypt.pdf $(DESTDIR)$(DATAPATH)
-+install: library docs install-nodocs
-+	install -d -g wheel -o root $(DOCSDIR)
-+	install -g wheel -o root crypt.pdf $(DOCSDIR)
-+	install -g wheel -o root notes/* $(DOCSDIR)
+-	install -g root -o root doc/crypt.pdf $(DESTDIR)$(DATAPATH)
++install: docs install-nodocs
++	install -d -g wheel -o root $(DESTDIR)$(DATAPATH)
++	install -g wheel -o root doc/crypt.pdf $(DESTDIR)$(DATAPATH)
 +
-+install-nodocs:
++install-nodocs: library
 +	install -d -g wheel -o root $(DESTDIR)$(LIBPATH)
 +	install -d -g wheel -o root $(DESTDIR)$(INCPATH)
-+	install -d -g wheel -o root $(EXAMPLESDIR)
 +	install -g wheel -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
 +	install -g wheel -o root $(HEADERS) $(DESTDIR)$(INCPATH)
-+	install -g wheel -o root examples/* $(EXAMPLESDIR)
-+	install -g wheel -o root demos/* $(EXAMPLESDIR)
  
  #This rule cleans the source tree of all compiled code, not including the pdf
  #documentation.
diff --git a/security/libtomcrypt/pkg-plist b/security/libtomcrypt/pkg-plist
index 92cd3dce4dd..2068fd71ec8 100644
--- a/security/libtomcrypt/pkg-plist
+++ b/security/libtomcrypt/pkg-plist
@@ -1,8 +1,6 @@
 lib/libtomcrypt.a
-include/tommath.h
+include/ltc_tommath.h
 include/mycrypt_cfg.h
-include/mycrypt_gf.h
-include/mycrypt_kr.h
 include/mycrypt_misc.h
 include/mycrypt_prng.h
 include/mycrypt_cipher.h
@@ -12,23 +10,6 @@ include/mycrypt_pk.h
 include/mycrypt.h
 include/mycrypt_argchk.h
 include/mycrypt_custom.h
-%%EXAMPLESDIR%%/ch1-01.c
-%%EXAMPLESDIR%%/ch1-02.c
-%%EXAMPLESDIR%%/ch1-03.c
-%%EXAMPLESDIR%%/ch2-01.c
-%%EXAMPLESDIR%%/encrypt.c
-%%EXAMPLESDIR%%/small.c
-%%EXAMPLESDIR%%/x86_prof.c
-%%EXAMPLESDIR%%/hashsum.c
-%%EXAMPLESDIR%%/test.c
-%%EXAMPLESDIR%%/tv_gen.c
+include/mycrypt_pkcs.h
 %%PORTDOCS%%%%DOCSDIR%%/crypt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt
-%%PORTDOCS%%%%DOCSDIR%%/hmac_tv.txt
-%%PORTDOCS%%%%DOCSDIR%%/hash_tv.txt
-%%PORTDOCS%%%%DOCSDIR%%/omac_tv.txt
-%%PORTDOCS%%%%DOCSDIR%%/tech0001.txt
-%%PORTDOCS%%%%DOCSDIR%%/tech0002.txt
-%%PORTDOCS%%%%DOCSDIR%%/tech0003.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%