From a9c61b88ca9b271716b3fb62be78ce10aa956c22 Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Wed, 19 Feb 2014 12:15:06 +0000 Subject: [PATCH] - Support staging - Respect CC - Respect CFLAGS - Fix build with clang --- dns/mdnsd/Makefile | 12 +++--------- dns/mdnsd/files/patch-Makefile | 13 +++++++------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dns/mdnsd/Makefile b/dns/mdnsd/Makefile index d994c1eaafe2..17e47cd1c8e5 100644 --- a/dns/mdnsd/Makefile +++ b/dns/mdnsd/Makefile @@ -10,17 +10,11 @@ MASTER_SITES= http://www.cs.cmu.edu/~dpelleg/download/ MAINTAINER= daniel+mdnsd@pelleg.org COMMENT= Advertise a service via Rendezvous -PLIST_FILES= bin/mhttp\ - bin/mquery +PLIST_FILES= bin/mhttp bin/mquery -NO_STAGE= yes do-install: - @${ECHO_MSG} "Installing files" -.for i in mhttp mquery - @${INSTALL} ${COPY} ${_BINOWNGRP} ${WRKSRC}/${i} ${PREFIX}/bin +.for f in mhttp mquery + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor -post-install: - @${CAT} ${PKGMESSAGE} - .include diff --git a/dns/mdnsd/files/patch-Makefile b/dns/mdnsd/files/patch-Makefile index 2b817ebc0b78..1aba5b247129 100644 --- a/dns/mdnsd/files/patch-Makefile +++ b/dns/mdnsd/files/patch-Makefile @@ -1,16 +1,17 @@ -diff -ruN Makefile.orig Makefile ---- Makefile.orig Tue Feb 18 09:00:04 2003 -+++ Makefile Mon Sep 25 22:11:16 2006 -@@ -1,10 +1,10 @@ +--- Makefile.orig 2003-02-18 08:00:04.000000000 +0100 ++++ Makefile 2014-02-19 13:13:13.848094695 +0100 +@@ -1,10 +1,12 @@ ++CC?=gcc ++ all: mquery mhttp mhttp: mhttp.c - gcc -g -o mhttp mhttp.c mdnsd.c 1035.c sdtxt.c xht.c -+ gcc -Wall -g -o mhttp mhttp.c mdnsd.c 1035.c sdtxt.c xht.c ++ ${CC} ${CFLAGS} -o mhttp mhttp.c mdnsd.c 1035.c sdtxt.c xht.c mquery: mquery.c - gcc -g -o mquery mquery.c mdnsd.c 1035.c -+ gcc -Wall -g -o mquery mquery.c mdnsd.c 1035.c ++ ${CC} ${CFLAGS} -o mquery mquery.c mdnsd.c 1035.c clean: rm -f mquery mhttp