Attachment 108041 Details for Bug 148854 – file.diff

[patch] file.diff

file.diff (text/plain), 2.16 KB, created by Brendan Fabeny on 2010-07-23 05:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Fabeny

Created: 2010-07-23 05:20:02 UTC

Size: 2.16 KB

patch

obsolete

>diff -ruN -x 'new.*' -x 'old.*' tor-devel.orig/Makefile tor-devel/Makefile
>--- tor-devel.orig/Makefile	2010-07-22 23:45:25.000000000 -0400
>+++ tor-devel/Makefile	2010-07-23 00:12:22.000000000 -0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tor
>-DISTVERSION=	0.2.2.13-alpha
>+DISTVERSION=	0.2.2.14-alpha
> CATEGORIES=	security net ipv6
> MASTER_SITES=	http://www.torproject.org/dist/ \
> 		http://tor.cypherpunks.at/dist/ \
>@@ -23,7 +23,6 @@
> 
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
> CONFIGURE_ARGS+=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
> CPPFLAGS+=	-I${LOCALBASE}/include
> CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
>@@ -43,6 +42,10 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if  ( ${OSVERSION} < 801000 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900011) )
>+WITH_OPENSSL_PORT=	yes
>+.endif
>+
> .if defined(WITH_BUFFREELISTS)
> CONFIGURE_ARGS+=	--enable-buf-freelists
> .else
>@@ -82,15 +85,11 @@
> 		${WRKSRC}/contrib/tor-tsocks.conf.sample
> 	@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
> 		${WRKSRC}/contrib/Makefile.in
>-	@${FIND} -X ${WRKSRC} -type f | ${XARGS} \
>-		-n 10 ${REINPLACE_CMD} -E \
>-		-e 's|-g -O2||g' \
>-		-e 's|-O2||g' \
>-		-e 's|-g -O||g' \
>-		-e 's|netinet/in6|netinet6/in6|g'
>+	@${REINPLACE_CMD} -e '\|CFLAGS=|{s|-g||;s|-O[0-9]\{0,1\}||;}' \
>+		-e 's|netinet/in6|netinet6/in6|g' ${WRKSRC}/configure
> 
> post-configure:
>-	@${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
>+	@${FIND} -X ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
> 		"s|-lpthread|${PTHREAD_LIBS}|g"
> 
> pre-su-install:
>diff -ruN -x 'new.*' -x 'old.*' tor-devel.orig/distinfo tor-devel/distinfo
>--- tor-devel.orig/distinfo	2010-07-22 23:45:33.000000000 -0400
>+++ tor-devel/distinfo	2010-07-22 21:57:20.000000000 -0400
>@@ -1,3 +1,3 @@
>-MD5 (tor-0.2.2.13-alpha.tar.gz) = 8e332a7a91f78cdc3071a6fd77609264
>-SHA256 (tor-0.2.2.13-alpha.tar.gz) = abf0386ceec9b04a795ac270cdad40f0497916eaf1cec4f952c915a3a7da3dc2
>-SIZE (tor-0.2.2.13-alpha.tar.gz) = 2306769
>+MD5 (tor-0.2.2.14-alpha.tar.gz) = 62100f26d9ccdbe9a570d0757946dfb9
>+SHA256 (tor-0.2.2.14-alpha.tar.gz) = 0afc7b79007b5265d59dbca0a5e676aa22ea7177c512253d3a06308d30fd895f
>+SIZE (tor-0.2.2.14-alpha.tar.gz) = 2527986

Actions: View | Diff

Attachments on bug 148854: 108041