Attachment #172271 for bug #210885




# $FreeBSD: head/dns/dnscrypt-wrapper/Makefile 412346 2016-04-01 14:00:51Z mat $

PORTNAME=	dnscrypt-wrapper
PORTVERSION=	0.2.1
DISTVERSIONPREFIX=	v
PORTREVISION=	2
CATEGORIES=	dns

MAINTAINER=	freebsd@toyingwithfate.com

SUB_LIST+=	ETCDNSCRYPTWRAPPER="${ETCDNSCRYPTWRAPPER}" USERS="${USERS}"
USE_RC_SUBR=	${PORTNAME}

USES=		gmake localbase
MAKE_ARGS=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" PREFIX="${STAGEDIR}${PREFIX}"

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
	@${MKDIR} ${STAGEDIR}${ETCDNSCRYPTWRAPPER}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)dnscrypt-wrapper/distinfo (-2 / +2 lines)
1	SHA256 (Cofyc-dnscrypt-wrapper-v0.2_GH0.tar.gz) = 36612c5eb440658a27619ae6e345582e6e3be7a40e9215ea82ac6f65c15de95f	1	SHA256 (Cofyc-dnscrypt-wrapper-v0.2.1_GH0.tar.gz) = 28c9936e90fc5602821353ca34c3180a047ae9eff08e0373cfa582e6af0c4e90
2	SIZE (Cofyc-dnscrypt-wrapper-v0.2_GH0.tar.gz) = 50925	2	SIZE (Cofyc-dnscrypt-wrapper-v0.2.1_GH0.tar.gz) = 52026




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




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

Return to bug 210885

Lines 1-9 Link Here

(-)dnscrypt-wrapper/Makefile (-6 / +4 lines)
1	# $FreeBSD: head/dns/dnscrypt-wrapper/Makefile 412346 2016-04-01 14:00:51Z mat $	1	# $FreeBSD: head/dns/dnscrypt-wrapper/Makefile 412346 2016-04-01 14:00:51Z mat $
2		2
3	PORTNAME= dnscrypt-wrapper	3	PORTNAME= dnscrypt-wrapper
4	PORTVERSION= 0.2	4	PORTVERSION= 0.2.1
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 2
7	CATEGORIES= dns	6	CATEGORIES= dns
8		7
9	MAINTAINER= freebsd@toyingwithfate.com	8	MAINTAINER= freebsd@toyingwithfate.com
Lines 23-33 Link Here
23	SUB_LIST+= ETCDNSCRYPTWRAPPER="${ETCDNSCRYPTWRAPPER}" USERS="${USERS}"	22	SUB_LIST+= ETCDNSCRYPTWRAPPER="${ETCDNSCRYPTWRAPPER}" USERS="${USERS}"
24	USE_RC_SUBR= ${PORTNAME}	23	USE_RC_SUBR= ${PORTNAME}
25		24
26	USES= gmake	25	USES= gmake localbase
27	MAKE_ARGS= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" PREFIX="${STAGEDIR}${PREFIX}"
28		26
29	post-install:	27	post-install:
30	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*	28	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
31	${MKDIR} ${STAGEDIR}${ETCDNSCRYPTWRAPPER}	29	@${MKDIR} ${STAGEDIR}${ETCDNSCRYPTWRAPPER}
32		30
33	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Line 0 Link Here

(-)dnscrypt-wrapper/files/patch-Makefile (+29 lines)
	1	--- Makefile.orig 2016-07-08 19:10:05 UTC
	2	+++ Makefile
	3	@@ -7,7 +7,7 @@ all::
	4
	5	### Defaults
	6
	7	-BASIC_CFLAGS = -O2 -std=c99 -Wall -I./argparse
	8	+BASIC_CFLAGS = -std=c99 -Wall -I./argparse
	9	BASIC_LDFLAGS = -lm -lsodium
	10
	11	# Guard against environment variables
	12	@@ -29,13 +29,13 @@ uname_P := $(shell sh -c 'uname -p 2>/de
	13	uname_V := $(shell sh -c 'uname -v 2>/dev/null \|\| echo not')
	14
	15	# CFLAGS and LDFLAGS are for users to override
	16	-CFLAGS = -g -O2 -Wall
	17	-LDFLAGS =
	18	+CFLAGS ?= -g -O2 -Wall
	19	+LDFLAGS ?=
	20	STRIP ?= strip
	21
	22	# We use ALL_* variants
	23	-ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)
	24	-ALL_LDFLAGS = $(LDFLAGS) $(BASIC_LDFLAGS)
	25	+ALL_CFLAGS = $(BASIC_CFLAGS) $(CFLAGS)
	26	+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
	27
	28	ifdef PREFIX
	29	prefix = $(PREFIX)

Line 0 Link Here

(-)dnscrypt-wrapper/files/patch-argparse_Makefile (+19 lines)
	1	--- argparse/Makefile.orig 2016-07-08 19:10:50 UTC
	2	+++ argparse/Makefile
	3	@@ -1,10 +1,13 @@
	4	# Defaults
	5	-BASIC_CFLAGS = -Wall -O3 -g -ggdb -fPIC
	6	+CFLAGS ?= -O3 -g -ggdb
	7	+LDFLAGS ?=
	8	+
	9	+BASIC_CFLAGS = -Wall -fPIC
	10	BASIC_LDFLAGS = -lm
	11
	12	# We use ALL_* variants
	13	-ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)
	14	-ALL_LDFLAGS = $(LDFLAGS) $(BASIC_LDFLAGS)
	15	+ALL_CFLAGS = $(BASIC_CFLAGS) $(CFLAGS)
	16	+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
	17
	18	LIBNAME=libargparse
	19