Attachment #157680 for bug #200816




# $FreeBSD$

PORTNAME=	polarssl
PORTVERSION=	1.3.11
DISTVERSIONSUFFIX=	-gpl
#PORTREVISION=	1
CATEGORIES=	security devel

do-install:
	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"
	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/
	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.9
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.9
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.9 libpolarssl.so)
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.9 libmbedtls.so.9)
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.9 libmbedtls.so)
.for i in ${BINFILES}
	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
.endfor

Lines 1-2 Link Here

(-)polarssl13/distinfo (-2 / +2 lines)
1	SHA256 (mbedtls-1.3.10-gpl.tgz) = 746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e	1	SHA256 (mbedtls-1.3.11-gpl.tgz) = 67a593027b6a442a4fa5b6c224c4ac8cdae5be721f5a28a11d34f10dcda441cb
2	SIZE (mbedtls-1.3.10-gpl.tgz) = 1709888	2	SIZE (mbedtls-1.3.11-gpl.tgz) = 1731809




--- library/Makefile.orig	2015-06-12 04:52:45.541565710 -0700
+++ library/Makefile	2015-06-12 04:54:29.037559649 -0700
@@ -24,12 +24,12 @@
 endif
 
 # To compile as a shared library:
-ifdef SHARED
+#ifdef SHARED
 # all code is position-indep with mingw, avoid warning about useless flag
 ifndef WINDOWS_BUILD
 LOCAL_CFLAGS += -fPIC -fpic
 endif
-endif
+#endif
 
 SOEXT=so.9
 
@@ -73,11 +73,11 @@
 
 .SILENT:
 

-ifndef SHARED
-all: static
-else
+#ifndef SHARED
+#all: static
+#else
 all: shared static
-endif
+#endif
 
 static: libpolarssl.a
 

Lines 84-92 Link Here

(-)polarssl13/pkg-plist (-2 / +2 lines)
84	include/polarssl/xtea.h	84	include/polarssl/xtea.h
85	lib/libpolarssl.a	85	lib/libpolarssl.a
86	lib/libpolarssl.so	86	lib/libpolarssl.so
87	lib/libpolarssl.so.8	87	lib/libpolarssl.so.9
88	lib/libmbedtls.so	88	lib/libmbedtls.so
89	lib/libmbedtls.so.8	89	lib/libmbedtls.so.9
90	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	90	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
91	%%PORTDOCS%%%%DOCSDIR%%/README.rst	91	%%PORTDOCS%%%%DOCSDIR%%/README.rst
92	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	92	%%PORTDOCS%%%%DOCSDIR%%/LICENSE

Return to bug 200816

Lines 1-7 Link Here

(-)polarssl13/Makefile (-6 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= polarssl	3	PORTNAME= polarssl
4	PORTVERSION= 1.3.10	4	PORTVERSION= 1.3.11
5	DISTVERSIONSUFFIX= -gpl	5	DISTVERSIONSUFFIX= -gpl
6	#PORTREVISION= 1	6	#PORTREVISION= 1
7	CATEGORIES= security devel	7	CATEGORIES= security devel
Lines 33-43 Link Here
33	do-install:	33	do-install:
34	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"	34	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"
35	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/	35	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/
36	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8	36	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.9
37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.9
38	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libpolarssl.so)	38	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.9 libpolarssl.so)
39	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libmbedtls.so.8)	39	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.9 libmbedtls.so.9)
40	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.8 libmbedtls.so)	40	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.9 libmbedtls.so)
41	.for i in ${BINFILES}	41	.for i in ${BINFILES}
42	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}	42	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
43	.endfor	43	.endfor

Lines 1-16 Link Here

(-)polarssl13/files/patch-library-Makefile (-7 / +16 lines)
1	--- library/Makefile.orig 2015-02-11 01:00:42.000000000 +0900	1	--- library/Makefile.orig 2015-06-12 04:52:45.541565710 -0700
2	+++ library/Makefile 2015-02-18 12:47:25.000000000 +0900	2	+++ library/Makefile 2015-06-12 04:54:29.037559649 -0700
3	@@ -18,9 +18,7 @@	3	@@ -24,12 +24,12 @@
4	# CFLAGS += -D_BSD_EXTENSION	4	endif
5		5
6	# To compile as a shared library:	6	# To compile as a shared library:
7	-ifdef SHARED	7	-ifdef SHARED
8	CFLAGS += -fPIC	8	+#ifdef SHARED
		9	# all code is position-indep with mingw, avoid warning about useless flag
		10	ifndef WINDOWS_BUILD
		11	LOCAL_CFLAGS += -fPIC -fpic
		12	endif
9	-endif	13	-endif
		14	+#endif
10		15
11	SONAME=libmbedtls.so.8	16	SOEXT=so.9
12		17
13	@@ -65,11 +63,7 @@	18	@@ -73,11 +73,11 @@
14		19
15	.SILENT:	20	.SILENT:
16		21
Lines 17-24 Link Here
17	-ifndef SHARED	22	-ifndef SHARED
18	-all: static	23	-all: static
19	-else	24	-else
		25	+#ifndef SHARED
		26	+#all: static
		27	+#else
20	all: shared static	28	all: shared static
21	-endif	29	-endif
		30	+#endif
22		31
23	static: libpolarssl.a	32	static: libpolarssl.a
24		33