Attachment #54898 for bug #83040

View | Details | Raw Unified | Return to bug 83040
Collapse All | Expand All




#

PORTNAME=	libtomcrypt
PORTVERSION=	1.05
CATEGORIES=	security
MASTER_SITES=	http://libtomcrypt.org/files/
DISTNAME=	crypt-${PORTVERSION}


.if defined(WITH_DOCS)
BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
INSTALL_TARGET=	install_withdocs
.else
NOPORTDOCS=	yes
INSTALL_TARGET=	install_lib


post-patch:
	@${REINPLACE_CMD} -e \
		'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} && ${GMAKE} test && ${WRKSRC}/test)
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)libtomcrypt/distinfo (-2 / +2 lines)
1	MD5 (crypt-1.02.tar.bz2) = f571fb2f984ec59d229a7f691c35b4d1	1	MD5 (crypt-1.05.tar.bz2) = 9c2d85c7789433e12a120629af78f8f9
2	SIZE (crypt-1.02.tar.bz2) = 1025539	2	SIZE (crypt-1.05.tar.bz2) = 1074750




--- 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)

Return to bug 83040

Lines 6-12 Link Here

(-)libtomcrypt/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= libtomcrypt	8	PORTNAME= libtomcrypt
9	PORTVERSION= 1.02	9	PORTVERSION= 1.05
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://libtomcrypt.org/files/	11	MASTER_SITES= http://libtomcrypt.org/files/
12	DISTNAME= crypt-${PORTVERSION}	12	DISTNAME= crypt-${PORTVERSION}
Lines 27-32 Link Here
27		27
28	.if defined(WITH_DOCS)	28	.if defined(WITH_DOCS)
29	BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX	29	BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX
		30	INSTALL_TARGET= install_withdocs
30	.else	31	.else
31	NOPORTDOCS= yes	32	NOPORTDOCS= yes
32	INSTALL_TARGET= install_lib	33	INSTALL_TARGET= install_lib
Lines 34-47 Link Here
34		35
35	post-patch:	36	post-patch:
36	@${REINPLACE_CMD} -e \	37	@${REINPLACE_CMD} -e \
37	's\|/usr\|${PREFIX}\|; s\|dvipdf\|dvipdft\|; \	38	's\|dvipdf\|dvipdft\|; \
38	s\|-O3\|\|; s\|-funroll-loops\|\|; s\|-fomit-frame-pointer\|\|; \	39	s\|-O3\|\|; s\|-funroll-loops\|\|; s\|-fomit-frame-pointer\|\|; \
39	s\|-Wno-unused-parameter\|\|' \	40	s\|-Wno-unused-parameter\|\|' \
40	${WRKSRC}/makefile	41	${WRKSRC}/makefile
41		42
42	.if defined(MAINTAINER_MODE)	43	.if defined(MAINTAINER_MODE)
43	test: build	44	test: build
44	(cd ${WRKSRC}/demos/test && ${MAKE} test ${MAKE_ARGS} && ${WRKSRC}/demos/test/test)	45	(cd ${WRKSRC} && ${GMAKE} test && ${WRKSRC}/test)
45	.endif	46	.endif
46		47
47	.include <bsd.port.post.mk>	48	.include <bsd.port.post.mk>

Line 0 Link Here

(-)libtomcrypt/files/patch-makefile (+56 lines)
	1	--- makefile.orig Mon Jun 27 08:08:34 2005
	2	+++ makefile Tue Jul 5 13:44:01 2005
	3	@@ -15,7 +15,7 @@
	4	#ARFLAGS=r
	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
	8	+CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow
	9
	10	# additional warnings (newer GCC 3.4 and higher)
	11	#CFLAGS += -Wsystem-headers -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wmissing-prototypes \
	12	@@ -24,10 +24,10 @@
	13	ifndef IGNORE_SPEED
	14
	15	# optimize for SPEED
	16	-CFLAGS += -O3 -funroll-loops
	17	+CFLAGS +=
	18
	19	-# add -fomit-frame-pointer. hinders debugging!
	20	-CFLAGS += -fomit-frame-pointer
	21	+# add . hinders debugging!
	22	+CFLAGS +=
	23
	24	# optimize for SIZE
	25	#CFLAGS += -Os -DLTC_SMALL_CODE
	26	@@ -57,9 +57,9 @@
	27	#INCPATH-The directory to install the header files for libtomcrypt.
	28	#DATAPATH-The directory to install the pdf docs.
	29	DESTDIR=
	30	-LIBPATH=/usr/lib
	31	-INCPATH=/usr/include
	32	-DATAPATH=/usr/share/doc/libtomcrypt/pdf
	33	+LIBPATH=${PREFIX}/lib
	34	+INCPATH=${PREFIX}/include
	35	+DATAPATH=${PREFIX}/share/doc/libtomcrypt/pdf
	36
	37	#Who do we install as?
	38	ifdef INSTALL_USER
	39	@@ -237,12 +237,16 @@
	40	#This rule installs the library and the header files. This must be run
	41	#as root in order to have a high enough permission to write to the correct
	42	#directories and to set the owner and group to root.
	43	-install: library docs
	44	+install_lib: library
	45	+ install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
	46	+ install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
	47	+
	48	+install_withdocs: library
	49	+ install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
	50	+ install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
	51	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
	52	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
	53	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(DATAPATH)
	54	- install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH)
	55	- install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
	56	install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)