5 files changed, 52 insertions, 51 deletions

diff --git a/security/libtomcrypt/Makefile b/security/libtomcrypt/Makefile
index 4c4a4e609341..5158aba23933 100644
--- a/security/libtomcrypt/Makefile
+++ b/security/libtomcrypt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libtomcrypt
-PORTVERSION=	0.99
+PORTVERSION=	1.00
 CATEGORIES=	security
 MASTER_SITES=	http://libtomcrypt.org/files/
 DISTNAME=	crypt-${PORTVERSION}
@@ -16,24 +16,24 @@ COMMENT=	Comprehensive, modular and portable cryptographic toolkit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKEFILE=	makefile
+MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ENV=	PREFIX=${PREFIX} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
 ALL_TARGET=	library
 
 .if defined(WITH_DOCS)
 BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
 .else
 NOPORTDOCS=	yes
-INSTALL_TARGET=	install-nodocs
+INSTALL_TARGET=	install_lib
 .endif
 
 .if defined(MAINTAINER_MODE)
 test:	build
-	(cd ${WRKSRC} && ${MAKE} test && ${WRKSRC}/test)
+	(cd ${WRKSRC}/demos/test && ${MAKE} test ${MAKE_ARGS} && ${WRKSRC}/demos/test/test)
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|
||' ${WRKSRC}/whirl.c
-
 .include <bsd.port.mk>
diff --git a/security/libtomcrypt/distinfo b/security/libtomcrypt/distinfo
index cc3bb4796746..05392d5a30a6 100644
--- a/security/libtomcrypt/distinfo
+++ b/security/libtomcrypt/distinfo
@@ -1,2 +1,2 @@
-MD5 (crypt-0.99.tar.bz2) = d726e7fc495353935b5c1914d62ecbfe
-SIZE (crypt-0.99.tar.bz2) = 887955
+MD5 (crypt-1.00.tar.bz2) = 73a896e5e8f636dd14c1517f572ddaa1
+SIZE (crypt-1.00.tar.bz2) = 940439
diff --git a/security/libtomcrypt/files/patch-demos-test-makefile b/security/libtomcrypt/files/patch-demos-test-makefile
new file mode 100644
index 000000000000..a2585b74d9c3
--- /dev/null
+++ b/security/libtomcrypt/files/patch-demos-test-makefile
@@ -0,0 +1,11 @@
+--- demos/test/makefile.orig	Mon Jan 10 16:35:45 2005
++++ demos/test/makefile	Mon Jan 10 16:35:58 2005
+@@ -19,7 +19,7 @@
+ #CCMALLOC = -lccmalloc -ldl
+ 
+ test: $(OBJECTS)
+-	$(CC) $(CFLAGS) $(OBJECTS) /usr/lib/libtomcrypt.a  $(CCMALLOC) -o test
++	$(CC) $(CFLAGS) $(OBJECTS) $(PREFIX)/lib/libtomcrypt.a  $(CCMALLOC) -o test
+ 	
+ clean:
+ 	rm -rf test *.o *.obj *.exe *~	.libs
diff --git a/security/libtomcrypt/files/patch-makefile b/security/libtomcrypt/files/patch-makefile
index 4ebf7349518c..a582545b8fb2 100644
--- a/security/libtomcrypt/files/patch-makefile
+++ b/security/libtomcrypt/files/patch-makefile
@@ -1,40 +1,29 @@
---- 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.
+--- makefile.orig	Thu Dec 30 19:55:17 2004
++++ makefile	Tue Jan 11 12:10:05 2005
+@@ -50,13 +50,13 @@
  #INCPATH-The directory to install the header files for libtomcrypt.
  #DATAPATH-The directory to install the pdf docs.
--DESTDIR=
+ DESTDIR=
 -LIBPATH=/usr/lib
 -INCPATH=/usr/include
 -DATAPATH=/usr/share/doc/libtomcrypt/pdf
-+DESTDIR=$(PREFIX)
-+LIBPATH=/lib
-+INCPATH=/include
-+DATAPATH=/share/doc/libtomcrypt/pdf
++LIBPATH=$(PREFIX)/lib
++INCPATH=$(PREFIX)/include
++DATAPATH=$(PREFIX)/share/doc/libtomcrypt/pdf
+ 
+ #Who do we install as?
+ USER=root
+-GROUP=root
++GROUP=wheel
  
  #List of objects to compile.
  
-@@ -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.
--install: library docs
--	install -d -g root -o root $(DESTDIR)$(LIBPATH)
--	install -d -g root -o root $(DESTDIR)$(INCPATH)
--	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 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: library
-+	install -d -g wheel -o root $(DESTDIR)$(LIBPATH)
-+	install -d -g wheel -o root $(DESTDIR)$(INCPATH)
-+	install -g wheel -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
-+	install -g wheel -o root $(HEADERS) $(DESTDIR)$(INCPATH)
+@@ -251,7 +251,7 @@
+ 	latex crypt > /dev/null
+ 	makeindex crypt.idx > /dev/null
+ 	latex crypt > /dev/null
+-	dvipdf crypt
++	dvipdft crypt
+ 	mv -ivf crypt.pdf doc/crypt.pdf
+ 	rm -f $(LEFTOVERS)
  
- #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 648361fa6e08..0d924ba0c98e 100644
--- a/security/libtomcrypt/pkg-plist
+++ b/security/libtomcrypt/pkg-plist
@@ -1,17 +1,18 @@
 lib/libtomcrypt.a
 include/ltc_tommath.h
-include/mycrypt_cfg.h
-include/mycrypt_misc.h
-include/mycrypt_prng.h
-include/mycrypt_cipher.h
-include/mycrypt_hash.h
-include/mycrypt_macros.h
-include/mycrypt_pk.h
-include/mycrypt.h
-include/mycrypt_argchk.h
-include/mycrypt_custom.h
-include/mycrypt_pkcs.h
+include/tomcrypt_cfg.h
+include/tomcrypt_misc.h
+include/tomcrypt_prng.h
+include/tomcrypt_cipher.h
+include/tomcrypt_hash.h
+include/tomcrypt_macros.h
+include/tomcrypt_pk.h
+include/tomcrypt.h
+include/tomcrypt_argchk.h
+include/tomcrypt_custom.h
+include/tomcrypt_pkcs.h
 include/tommath_class.h
 include/tommath_superclass.h
-%%PORTDOCS%%%%DOCSDIR%%/crypt.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/
 %%PORTDOCS%%@dirrm %%DOCSDIR%%