Attachment #126297 for bug #170045

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

Lines 7-13 Link Here

(-)./Makefile (-4 / +33 lines)
7		7
8	PORTNAME= cryptopp	8	PORTNAME= cryptopp
9	PORTVERSION= 5.6.1	9	PORTVERSION= 5.6.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= SF \	12	MASTER_SITES= SF \
13	http://www.cryptopp.com/	13	http://www.cryptopp.com/
Lines 16-21 Link Here
16	MAINTAINER= delphij@FreeBSD.org	16	MAINTAINER= delphij@FreeBSD.org
17	COMMENT= A free C++ class library of Cryptographic Primitives	17	COMMENT= A free C++ class library of Cryptographic Primitives
18		18
		19	OPTIONS_DEFINE= DEBUG DOCS STATIC THREADS
		20	OPTIONS_DEFAULT= STATIC THREADS
		21	STATIC_DESC= Build static version only (no shared libs)
		22
		23	.include <bsd.port.options.mk>
		24
19	NO_WRKSUBDIR= yes	25	NO_WRKSUBDIR= yes
20	USE_ZIP= yes	26	USE_ZIP= yes
21	EXTRACT_BEFORE_ARGS= -aq	27	EXTRACT_BEFORE_ARGS= -aq
Lines 23-30 Link Here
23	MAKE_JOBS_SAFE= yes	29	MAKE_JOBS_SAFE= yes
24	MAKEFILE= GNUmakefile	30	MAKEFILE= GNUmakefile
25		31
26	.if !defined(WITH_DEBUG)	32	LIBVERSION= 0
27	CXXFLAGS+= -DNDEBUG	33	PLIST_SUB+= LIBVERSION=${LIBVERSION}
		34	PLIST_SUB+= PORTVERSION=${PORTVERSION}
		35
		36	.if ${PORT_OPTIONS:MDEBUG}
		37	CXXFLAGS+= -DNDEBUG
		38	.endif
		39
		40	.if ${PORT_OPTIONS:MSTATIC}
		41	PLIST_SUB+= DYNAMIC_ENABLED="@comment "
		42	.else
		43	PLIST_SUB+= DYNAMIC_ENABLED=""
		44	MAKE_ARGS= all libcryptopp.so
		45	CXXFLAGS+= -fPIC
		46	USE_LDCONFIG= yes
		47	.endif
		48
		49	.if ${PORT_OPTIONS:MTHREADS}
		50	CXXFLAGS+= ${PTHREAD_CFLAGS}
		51	LDFLAGS+= ${PTHREAD_LIBS}
28	.endif	52	.endif
29		53
30	do-install:	54	do-install:
Lines 36-42 Link Here
36	-and -not -name 'resource.h'`; do \	60	-and -not -name 'resource.h'`; do \
37	${INSTALL_DATA} $$i ${PREFIX}/include/cryptopp; \	61	${INSTALL_DATA} $$i ${PREFIX}/include/cryptopp; \
38	done)	62	done)
39	.if !defined(NOPORTDOCS)	63	.if !${PORT_OPTIONS:MSTATIC}
		64	${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${PREFIX}/lib/libcryptopp.so.${PORTVERSION}
		65	${LN} -fs libcryptopp.so.${PORTVERSION} ${PREFIX}/lib/libcryptopp.so.${LIBVERSION}
		66	${LN} -fs libcryptopp.so.${LIBVERSION} ${PREFIX}/lib/libcryptopp.so
		67	.endif
		68	.if ${PORT_OPTIONS:MDOCS}
40	${MKDIR} ${PREFIX}/share/doc/cryptopp	69	${MKDIR} ${PREFIX}/share/doc/cryptopp
41	${CP} ${WRKSRC}/Readme.txt ${PREFIX}/share/doc/cryptopp/README	70	${CP} ${WRKSRC}/Readme.txt ${PREFIX}/share/doc/cryptopp/README
42	${CP} ${WRKSRC}/License.txt ${PREFIX}/share/doc/cryptopp/License	71	${CP} ${WRKSRC}/License.txt ${PREFIX}/share/doc/cryptopp/License




--- ./GNUmakefile.orig	2010-08-09 14:22:42.000000000 -0700
+++ ./GNUmakefile	2012-07-21 03:14:01.000000000 +0200
@@ -1,4 +1,4 @@
-CXXFLAGS = -DNDEBUG -g -O2
+#CXXFLAGS = -DNDEBUG -g -O2

 ISMINGW = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "mingw")
 
 ifneq ($(GCC42_OR_LATER),0)
@@ -151,7 +151,7 @@
	$(RANLIB) $@
 
 libcryptopp.so: $(LIBOBJS)
-	$(CXX) -shared -o $@ $(LIBOBJS)
+	$(CXX) -shared -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBOBJS)
 
 cryptest.exe: libcryptopp.a $(TESTOBJS)
	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)

Lines 132-137 Link Here

(-)./pkg-plist (+3 lines)
132	include/cryptopp/zinflate.h	132	include/cryptopp/zinflate.h
133	include/cryptopp/zlib.h	133	include/cryptopp/zlib.h
134	lib/libcryptopp.a	134	lib/libcryptopp.a
		135	%%DYNAMIC_ENABLED%%lib/libcryptopp.so
		136	%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%LIBVERSION%%
		137	%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%PORTVERSION%%
135	@dirrm include/cryptopp	138	@dirrm include/cryptopp
136	%%PORTDOCS%%%%DOCSDIR%%/README	139	%%PORTDOCS%%%%DOCSDIR%%/README
137	%%PORTDOCS%%%%DOCSDIR%%/License	140	%%PORTDOCS%%%%DOCSDIR%%/License

Return to bug 170045

Lines 1-5 Link Here

(-)./files/patch-GNUmakefile (-1 / +10 lines)
1	--- ./GNUmakefile.orig 2010-08-09 14:22:42.000000000 -0700	1	--- ./GNUmakefile.orig 2010-08-09 14:22:42.000000000 -0700
2	+++ ./GNUmakefile 2011-01-27 12:43:08.905856979 -0800	2	+++ ./GNUmakefile 2012-07-21 03:14:01.000000000 +0200
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-CXXFLAGS = -DNDEBUG -g -O2	4	-CXXFLAGS = -DNDEBUG -g -O2
5	+#CXXFLAGS = -DNDEBUG -g -O2	5	+#CXXFLAGS = -DNDEBUG -g -O2
Lines 19-21 Link Here
19	ISMINGW = $(shell $(CXX) --version 2>&1 \| $(EGREP) -c "mingw")	19	ISMINGW = $(shell $(CXX) --version 2>&1 \| $(EGREP) -c "mingw")
20		20
21	ifneq ($(GCC42_OR_LATER),0)	21	ifneq ($(GCC42_OR_LATER),0)
		22	@@ -151,7 +151,7 @@
		23	$(RANLIB) $@
		24
		25	libcryptopp.so: $(LIBOBJS)
		26	- $(CXX) -shared -o $@ $(LIBOBJS)
		27	+ $(CXX) -shared -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBOBJS)
		28
		29	cryptest.exe: libcryptopp.a $(TESTOBJS)
		30	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)