From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 20 18:57:13 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BD2376C;
 Fri, 20 Dec 2013 18:57:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A94D1106E;
 Fri, 20 Dec 2013 18:57:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKIvDZv088902;
 Fri, 20 Dec 2013 18:57:13 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKIvD1Z088901;
 Fri, 20 Dec 2013 18:57:13 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201312201857.rBKIvD1Z088901@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 20 Dec 2013 18:57:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337073 - head/print/pup
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 18:57:13 -0000

Author: pawel
Date: Fri Dec 20 18:57:13 2013
New Revision: 337073
URL: http://svnweb.freebsd.org/changeset/ports/337073

Log:
  Respect CC/CFLAGS
  
  PR:		ports/184877
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/print/pup/Makefile   (contents, props changed)

Modified: head/print/pup/Makefile
==============================================================================
--- head/print/pup/Makefile	Fri Dec 20 18:51:31 2013	(r337072)
+++ head/print/pup/Makefile	Fri Dec 20 18:57:13 2013	(r337073)
@@ -5,28 +5,28 @@ PORTNAME=	pup
 PORTVERSION=	1.1
 PORTREVISION=	4
 CATEGORIES=	print
-#MASTER_SITES=	http://download.sourceforge.net/pup/
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GTK+ printer setup and maintaining tool
+COMMENT=	GTK+ printer setup and maintaining tool
+
+WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-PLIST_FILES=	bin/pup
 USE_GNOME=	gtk12
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/
+PLIST_FILES=	bin/pup
 
-NO_STAGE=	yes
 post-patch:
-	@echo ${WRKSRC}
-	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|g' ${WRKSRC}/Makefile
-
-.for file in lexgui.c build_choices.c proutines.c
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e \
+		's| =| ?=| ; \
+		 s|$$(CC) $$(SRCS)|$$(CC) $$(CFLAGS) $$(SRCS)| ; \
+		 s|gtk-config|$$(GTK_CONFIG)|' ${WRKSRC}/Makefile
+.for i in lexgui.c build_choices.c proutines.c
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/${i}
 .endfor
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/pup ${PREFIX}/bin/
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} pup ${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>