ports/184877: print/pup: Support CC/CFLAGS properly

[KATO Tsuguru]

>Number:         184877
>Category:       ports
>Synopsis:       print/pup: Support CC/CFLAGS properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:21 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/print/pup/Makefile print/pup/Makefile
--- /usr/ports/print/pup/Makefile	2013-11-06 22:05:16.000000000 +0900
+++ print/pup/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -3,30 +3,30 @@
 
 PORTNAME=	pup
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
-#MASTER_SITES=	http://download.sourceforge.net/pup/
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	ports at 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>
>Release-Note:
>Audit-Trail:
>Unformatted: