Bug 184877

Comment 1 Pawel Pekala 2013-12-20 18:52:09 UTC

Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.

Comment 2 dfilter service 2013-12-20 18:57:20 UTC

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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 3 Pawel Pekala 2013-12-20 18:57:22 UTC

State Changed
From-To: open->closed

Committed. Thanks!