Attachment 54898 Details for Bug 83040 – file.diff

[patch] file.diff

file.diff (text/plain), 3.69 KB, created by Wesley Shields on 2005-07-06 01:40:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wesley Shields

Created: 2005-07-06 01:40:17 UTC

Size: 3.69 KB

patch

obsolete

>diff -ruN libtomcrypt.orig/Makefile libtomcrypt/Makefile
>--- libtomcrypt.orig/Makefile	Sun May 22 11:43:56 2005
>+++ libtomcrypt/Makefile	Tue Jul  5 14:53:14 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	libtomcrypt
>-PORTVERSION=	1.02
>+PORTVERSION=	1.05
> CATEGORIES=	security
> MASTER_SITES=	http://libtomcrypt.org/files/
> DISTNAME=	crypt-${PORTVERSION}
>@@ -27,6 +27,7 @@
> 
> .if defined(WITH_DOCS)
> BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
>+INSTALL_TARGET=	install_withdocs
> .else
> NOPORTDOCS=	yes
> INSTALL_TARGET=	install_lib
>@@ -34,14 +35,14 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|/usr|${PREFIX}|; s|dvipdf|dvipdft|; \
>+		's|dvipdf|dvipdft|; \
> 		 s|-O3||; s|-funroll-loops||; s|-fomit-frame-pointer||; \
> 		 s|-Wno-unused-parameter||' \
> 		${WRKSRC}/makefile
> 
> .if defined(MAINTAINER_MODE)
> test:	build
>-	(cd ${WRKSRC}/demos/test && ${MAKE} test ${MAKE_ARGS} && ${WRKSRC}/demos/test/test)
>+	(cd ${WRKSRC} && ${GMAKE} test && ${WRKSRC}/test)
> .endif
> 
> .include <bsd.port.post.mk>
>diff -ruN libtomcrypt.orig/distinfo libtomcrypt/distinfo
>--- libtomcrypt.orig/distinfo	Sun May 22 11:43:56 2005
>+++ libtomcrypt/distinfo	Fri Jul  1 14:23:22 2005
>@@ -1,2 +1,2 @@
>-MD5 (crypt-1.02.tar.bz2) = f571fb2f984ec59d229a7f691c35b4d1
>-SIZE (crypt-1.02.tar.bz2) = 1025539
>+MD5 (crypt-1.05.tar.bz2) = 9c2d85c7789433e12a120629af78f8f9
>+SIZE (crypt-1.05.tar.bz2) = 1074750
>diff -ruN libtomcrypt.orig/files/patch-makefile libtomcrypt/files/patch-makefile
>--- libtomcrypt.orig/files/patch-makefile	Wed Dec 31 19:00:00 1969
>+++ libtomcrypt/files/patch-makefile	Tue Jul  5 13:45:04 2005
>@@ -0,0 +1,56 @@
>+--- makefile.orig	Mon Jun 27 08:08:34 2005
>++++ makefile	Tue Jul  5 13:44:01 2005
>+@@ -15,7 +15,7 @@
>+ #ARFLAGS=r
>+ 
>+ # Compilation flags. Note the += does not write over the user's CFLAGS!
>+-CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -Wno-unused-parameter
>++CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow 
>+ 
>+ # additional warnings (newer GCC 3.4 and higher)
>+ #CFLAGS += -Wsystem-headers -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wmissing-prototypes \
>+@@ -24,10 +24,10 @@
>+ ifndef IGNORE_SPEED
>+ 
>+ # optimize for SPEED
>+-CFLAGS += -O3 -funroll-loops
>++CFLAGS +=  
>+ 
>+-# add -fomit-frame-pointer.  hinders debugging!
>+-CFLAGS += -fomit-frame-pointer
>++# add .  hinders debugging!
>++CFLAGS += 
>+ 
>+ # optimize for SIZE
>+ #CFLAGS += -Os -DLTC_SMALL_CODE
>+@@ -57,9 +57,9 @@
>+ #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
>++LIBPATH=${PREFIX}/lib
>++INCPATH=${PREFIX}/include
>++DATAPATH=${PREFIX}/share/doc/libtomcrypt/pdf
>+ 
>+ #Who do we install as?
>+ ifdef INSTALL_USER
>+@@ -237,12 +237,16 @@
>+ #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_lib: library
>++	install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
>++	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
>++
>++install_withdocs: library
>++	install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
>++	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
>+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
>+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
>+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(DATAPATH)
>+-	install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
>+-	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
>+ 	install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)

Actions: View | Diff

Attachments on bug 83040: 54898