Attachment 172271 Details for Bug 210885 – 2nd attempt at patch to install new version 0.2.1

[patch] 2nd attempt at patch to install new version 0.2.1

dnscrypt-wrapper_0.2.1_rev2.patch (text/plain), 3.35 KB, created by Will on 2016-07-09 02:13:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will

Created: 2016-07-09 02:13:34 UTC

Size: 3.35 KB

patch

obsolete

>diff -ruN dnscrypt-wrapper_0.2/Makefile dnscrypt-wrapper/Makefile
>--- dnscrypt-wrapper_0.2/Makefile	2016-04-01 10:00:51.000000000 -0400
>+++ dnscrypt-wrapper/Makefile	2016-07-08 15:07:32.610847000 -0400
>@@ -1,9 +1,8 @@
> # $FreeBSD: head/dns/dnscrypt-wrapper/Makefile 412346 2016-04-01 14:00:51Z mat $
> 
> PORTNAME=	dnscrypt-wrapper
>-PORTVERSION=	0.2
>+PORTVERSION=	0.2.1
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
> CATEGORIES=	dns
> 
> MAINTAINER=	freebsd@toyingwithfate.com
>@@ -23,11 +22,10 @@
> SUB_LIST+=	ETCDNSCRYPTWRAPPER="${ETCDNSCRYPTWRAPPER}" USERS="${USERS}"
> USE_RC_SUBR=	${PORTNAME}
> 
>-USES=		gmake
>-MAKE_ARGS=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" PREFIX="${STAGEDIR}${PREFIX}"
>+USES=		gmake localbase
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
>-	${MKDIR} ${STAGEDIR}${ETCDNSCRYPTWRAPPER}
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
>+	@${MKDIR} ${STAGEDIR}${ETCDNSCRYPTWRAPPER}
> 
> .include <bsd.port.mk>
>diff -ruN dnscrypt-wrapper_0.2/distinfo dnscrypt-wrapper/distinfo
>--- dnscrypt-wrapper_0.2/distinfo	2015-12-08 04:05:15.000000000 -0500
>+++ dnscrypt-wrapper/distinfo	2016-07-08 14:52:53.412238000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (Cofyc-dnscrypt-wrapper-v0.2_GH0.tar.gz) = 36612c5eb440658a27619ae6e345582e6e3be7a40e9215ea82ac6f65c15de95f
>-SIZE (Cofyc-dnscrypt-wrapper-v0.2_GH0.tar.gz) = 50925
>+SHA256 (Cofyc-dnscrypt-wrapper-v0.2.1_GH0.tar.gz) = 28c9936e90fc5602821353ca34c3180a047ae9eff08e0373cfa582e6af0c4e90
>+SIZE (Cofyc-dnscrypt-wrapper-v0.2.1_GH0.tar.gz) = 52026
>Files dnscrypt-wrapper_0.2/dnscrypt-wrapper-0.2.1.txz and dnscrypt-wrapper/dnscrypt-wrapper-0.2.1.txz differ
>diff -ruN dnscrypt-wrapper_0.2/files/patch-Makefile dnscrypt-wrapper/files/patch-Makefile
>--- dnscrypt-wrapper_0.2/files/patch-Makefile	1969-12-31 19:00:00.000000000 -0500
>+++ dnscrypt-wrapper/files/patch-Makefile	2016-07-08 15:11:47.797020000 -0400
>@@ -0,0 +1,29 @@
>+--- Makefile.orig	2016-07-08 19:10:05 UTC
>++++ Makefile
>+@@ -7,7 +7,7 @@ all::
>+ 
>+ ### Defaults
>+ 
>+-BASIC_CFLAGS = -O2 -std=c99 -Wall -I./argparse
>++BASIC_CFLAGS = -std=c99 -Wall -I./argparse
>+ BASIC_LDFLAGS = -lm -lsodium
>+ 
>+ # Guard against environment variables
>+@@ -29,13 +29,13 @@ uname_P := $(shell sh -c 'uname -p 2>/de
>+ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
>+ 
>+ # CFLAGS and LDFLAGS are for users to override
>+-CFLAGS = -g -O2 -Wall
>+-LDFLAGS =
>++CFLAGS ?= -g -O2 -Wall
>++LDFLAGS ?=
>+ STRIP ?= strip
>+ 
>+ # We use ALL_* variants
>+-ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)
>+-ALL_LDFLAGS = $(LDFLAGS) $(BASIC_LDFLAGS)
>++ALL_CFLAGS = $(BASIC_CFLAGS) $(CFLAGS)
>++ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
>+ 
>+ ifdef PREFIX
>+ 	prefix = $(PREFIX)
>diff -ruN dnscrypt-wrapper_0.2/files/patch-argparse_Makefile dnscrypt-wrapper/files/patch-argparse_Makefile
>--- dnscrypt-wrapper_0.2/files/patch-argparse_Makefile	1969-12-31 19:00:00.000000000 -0500
>+++ dnscrypt-wrapper/files/patch-argparse_Makefile	2016-07-08 15:11:47.799180000 -0400
>@@ -0,0 +1,19 @@
>+--- argparse/Makefile.orig	2016-07-08 19:10:50 UTC
>++++ argparse/Makefile
>+@@ -1,10 +1,13 @@
>+ # Defaults
>+-BASIC_CFLAGS = -Wall -O3 -g -ggdb -fPIC
>++CFLAGS ?= -O3 -g -ggdb
>++LDFLAGS ?=
>++
>++BASIC_CFLAGS = -Wall -fPIC
>+ BASIC_LDFLAGS = -lm
>+ 
>+ # We use ALL_* variants
>+-ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)
>+-ALL_LDFLAGS = $(LDFLAGS) $(BASIC_LDFLAGS)
>++ALL_CFLAGS = $(BASIC_CFLAGS) $(CFLAGS)
>++ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
>+ 
>+ LIBNAME=libargparse
>+

Actions: View | Diff

Attachments on bug 210885: 172188 | 172271