Attachment #145525 for bug #192501





PORTNAME=	libtomcrypt
PORTVERSION=	1.17
PORTREVISION=	3
CATEGORIES=	security
MASTER_SITES=	http://libtom.org/files/
DISTNAME=	crypt-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Comprehensive, modular, and portable cryptographic toolkit

BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
MAKEFILE=	makefile
MAKE_ARGS=	DESTDIR="${STAGEDIR}" LIBPATH="${PREFIX}/lib" \
		INCPATH="${PREFIX}/include" DATAPATH="${DOCSDIR}/pdf"

USES=		gmake tar:bzip2
ALL_TARGET=	library

CFLAGS+=	-I${LOCALBASE}/include
EXTRALIBS=	-L${LOCALBASE}/lib
MAKEFILE=	makefile.shared
ALL_TARGET=	library
MAKE_ARGS=	IGNORE_SPEED=yes INCPATH="${PREFIX}/include" \
		LIBPATH="${PREFIX}/lib" EXTRALIBS="${EXTRALIBS}"
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES=		gmake libtool tar:bzip2

OPTIONS_DEFINE=		DOCS
OPTIONS_DEFAULT=	LIBTOMMATH
OPTIONS_MULTI=		MATH
OPTIONS_MULTI_MATH=	LIBTOMMATH TOMSFASTMATH GMP
LIBTOMMATH_DESC=	Use LibTomMath
TOMSFASTMATH_DESC=	Use TomsFastMath

.if ${PORT_OPTIONS:MLIBTOMMATH}
BUILD_DEPENDS+=	${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath
CFLAGS+=	-DLTM_DESC
EXTRALIBS+=	-ltommath
.endif

.if ${PORT_OPTIONS:MTOMSFASTMATH}
BUILD_DEPENDS+=	${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath
CFLAGS+=	-DTFM_DESC
EXTRALIBS+=	-ltfm
.endif

.if ${PORT_OPTIONS:MGMP}
LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
CFLAGS+=	-DGMP_DESC
EXTRALIBS+=	-lgmp
.endif

.if ! ${PORT_OPTIONS:MDOCS}
USE_TEX=	latex:build dvipdfmx:build
PORTDOCS=	*
.else
MAKE_ARGS+=	NODOCS=yes
.endif

post-patch:
	${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's| make | $$(MAKE) |' \
		-e 's|-g $$(GROUP)||' -e 's|-o $$(USER)||' \
		${WRKSRC}/makefile.shared ${WRKSRC}/testprof/makefile.shared

post-install:
	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
	${INSTALL_DATA} ${WRKSRC}/doc/crypt.pdf ${STAGEDIR}${DOCSDIR}/pdf

.if defined(MAINTAINER_MODE)
test:	build
	@${ECHO_MSG} "Testing with -DUSE_TFM..."




--- makefile.orig	Thu Nov 24 12:55:28 2005
+++ makefile	Fri Dec  2 22:38:47 2005
@@ -24,7 +24,7 @@
 endif
 
 # 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 -DLTC_SOURCE
+CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -DLTC_SOURCE -D_WCHAR_T
 
 # additional warnings (newer GCC 3.4 and higher)
 ifdef GCC_34
@@ -35,10 +35,10 @@
 ifndef IGNORE_SPEED
 
 # optimize for SPEED
-CFLAGS += -O3 -funroll-loops
+#CFLAGS += -O3 -funroll-loops
 
 # add -fomit-frame-pointer.  hinders debugging!
-CFLAGS += -fomit-frame-pointer
+#CFLAGS += -fomit-frame-pointer
 
 # optimize for SIZE
 #CFLAGS += -Os -DLTC_SMALL_CODE
@@ -275,11 +275,11 @@
 endif
 	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)
 ifndef NODOCS
-	install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)
+	install -d -g $(GROUP) -o $(USER) ${DESTDIR}$(DATAPATH)
+	install -g $(GROUP) -o $(USER) doc/crypt.pdf ${DESTDIR}$(DATAPATH)
 endif
 
 install_test: testprof/$(LIBTEST)
@@ -333,7 +333,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)
 

Lines 13-15 include/tomcrypt_pkcs.h Link Here

(-)security/libtomcrypt/pkg-plist (+8 lines)
13	include/tomcrypt_prng.h	13	include/tomcrypt_prng.h
14	include/tomcrypt_test.h	14	include/tomcrypt_test.h
15	lib/libtomcrypt.a	15	lib/libtomcrypt.a
		16	lib/libtomcrypt.so
		17	lib/libtomcrypt.so.0
		18	lib/libtomcrypt_prof.a
		19	lib/libtomcrypt_prof.so
		20	lib/libtomcrypt_prof.so.0
		21	%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
		22	%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
		23	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 192501

Lines 3-9 Link Here

(-)security/libtomcrypt/Makefile (-15 / +25 lines)
3		3
4	PORTNAME= libtomcrypt	4	PORTNAME= libtomcrypt
5	PORTVERSION= 1.17	5	PORTVERSION= 1.17
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://libtom.org/files/	8	MASTER_SITES= http://libtom.org/files/
9	DISTNAME= crypt-${PORTVERSION}	9	DISTNAME= crypt-${PORTVERSION}
Lines 11-29 DISTNAME= crypt-${PORTVERSION} Link Here
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Comprehensive, modular, and portable cryptographic toolkit	12	COMMENT= Comprehensive, modular, and portable cryptographic toolkit
13		13
14	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	14	BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool
15	MAKEFILE= makefile
16	MAKE_ARGS= DESTDIR="${STAGEDIR}" LIBPATH="${PREFIX}/lib" \
17	INCPATH="${PREFIX}/include" DATAPATH="${DOCSDIR}/pdf"
18
19	USES= gmake tar:bzip2
20	ALL_TARGET= library
21		15
22	CFLAGS+= -I${LOCALBASE}/include	16	CFLAGS+= -I${LOCALBASE}/include
		17	EXTRALIBS= -L${LOCALBASE}/lib
		18	MAKEFILE= makefile.shared
		19	ALL_TARGET= library
		20	MAKE_ARGS= IGNORE_SPEED=yes INCPATH="${PREFIX}/include" \
		21	LIBPATH="${PREFIX}/lib" EXTRALIBS="${EXTRALIBS}"
		22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		23	USES= gmake libtool tar:bzip2
23		24
24	OPTIONS_DEFINE= DOCS	25	OPTIONS_DEFINE= DOCS
25	OPTIONS_DEFAULT= LIBTOMMATH	26	OPTIONS_DEFAULT= LIBTOMMATH
26	OPTIONS_MULTI= MATH	27	OPTIONS_MULTI= MATH
27	OPTIONS_MULTI_MATH= LIBTOMMATH TOMSFASTMATH GMP	28	OPTIONS_MULTI_MATH= LIBTOMMATH TOMSFASTMATH GMP
28	LIBTOMMATH_DESC= Use LibTomMath	29	LIBTOMMATH_DESC= Use LibTomMath
29	TOMSFASTMATH_DESC= Use TomsFastMath	30	TOMSFASTMATH_DESC= Use TomsFastMath
Lines 33-57 TOMSFASTMATH_DESC= Use TomsFastMath Link Here
33	.if ${PORT_OPTIONS:MLIBTOMMATH}	34	.if ${PORT_OPTIONS:MLIBTOMMATH}
34	BUILD_DEPENDS+= ${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath	35	BUILD_DEPENDS+= ${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath
35	CFLAGS+= -DLTM_DESC	36	CFLAGS+= -DLTM_DESC
		37	EXTRALIBS+= -ltommath
36	.endif	38	.endif
37		39
38	.if ${PORT_OPTIONS:MTOMSFASTMATH}	40	.if ${PORT_OPTIONS:MTOMSFASTMATH}
39	BUILD_DEPENDS+= ${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath	41	BUILD_DEPENDS+= ${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath
40	CFLAGS+= -DTFM_DESC	42	CFLAGS+= -DTFM_DESC
		43	EXTRALIBS+= -ltfm
41	.endif	44	.endif
42		45
43	.if ${PORT_OPTIONS:MGMP}	46	.if ${PORT_OPTIONS:MGMP}
44	BUILD_DEPENDS+= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/gmp	47	LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp
45	CFLAGS+= -DGMP_DESC	48	CFLAGS+= -DGMP_DESC
		49	EXTRALIBS+= -lgmp
46	.endif	50	.endif
47		51
48	.if ${PORT_OPTIONS:MDOCS}	52	.if ! ${PORT_OPTIONS:MDOCS}
49	USE_TEX= latex:build dvipdfmx:build
50	PORTDOCS= *
51	.else
52	MAKE_ARGS+= NODOCS=yes	53	MAKE_ARGS+= NODOCS=yes
53	.endif	54	.endif
54		55
		56	post-patch:
		57	${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' -e 's\| make \| $$(MAKE) \|' \
		58	-e 's\|-g $$(GROUP)\|\|' -e 's\|-o $$(USER)\|\|' \
		59	${WRKSRC}/makefile.shared ${WRKSRC}/testprof/makefile.shared
		60
		61	post-install:
		62	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
		63	${INSTALL_DATA} ${WRKSRC}/doc/crypt.pdf ${STAGEDIR}${DOCSDIR}/pdf
		64
55	.if defined(MAINTAINER_MODE)	65	.if defined(MAINTAINER_MODE)
56	test: build	66	test: build
57	@${ECHO_MSG} "Testing with -DUSE_TFM..."	67	@${ECHO_MSG} "Testing with -DUSE_TFM..."

Lines 1-47 Link Here

(-)security/libtomcrypt/files/patch-makefile (-47 lines)
1	--- makefile.orig Thu Nov 24 12:55:28 2005
2	+++ makefile Fri Dec 2 22:38:47 2005
3	@@ -24,7 +24,7 @@
4	endif
5
6	# Compilation flags. Note the += does not write over the user's CFLAGS!
7	-CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -Wno-unused-parameter -DLTC_SOURCE
8	+CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -DLTC_SOURCE -D_WCHAR_T
9
10	# additional warnings (newer GCC 3.4 and higher)
11	ifdef GCC_34
12	@@ -35,10 +35,10 @@
13	ifndef IGNORE_SPEED
14
15	# optimize for SPEED
16	-CFLAGS += -O3 -funroll-loops
17	+#CFLAGS += -O3 -funroll-loops
18
19	# add -fomit-frame-pointer. hinders debugging!
20	-CFLAGS += -fomit-frame-pointer
21	+#CFLAGS += -fomit-frame-pointer
22
23	# optimize for SIZE
24	#CFLAGS += -Os -DLTC_SMALL_CODE
25	@@ -275,11 +275,11 @@
26	endif
27	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
28	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
29	- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(DATAPATH)
30	install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
31	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
32	ifndef NODOCS
33	- install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)
34	+ install -d -g $(GROUP) -o $(USER) ${DESTDIR}$(DATAPATH)
35	+ install -g $(GROUP) -o $(USER) doc/crypt.pdf ${DESTDIR}$(DATAPATH)
36	endif
37
38	install_test: testprof/$(LIBTEST)
39	@@ -333,7 +333,7 @@
40	latex crypt > /dev/null
41	makeindex crypt.idx > /dev/null
42	latex crypt > /dev/null
43	- dvipdf crypt
44	+ dvipdft crypt
45	mv -ivf crypt.pdf doc/crypt.pdf
46	rm -f $(LEFTOVERS)
47