Date: Thu, 1 Apr 2010 05:46:38 GMT From: Chris Petrik <chris@officialunix.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/145255: [PATCH] science/peekabot fix gcc issue Message-ID: <201004010546.o315kc3Y053379@www.freebsd.org> Resent-Message-ID: <201004010550.o315o3IB087258@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145255
>Category: ports
>Synopsis: [PATCH] science/peekabot fix gcc issue
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 01 05:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Chris Petrik
>Release: FreeBSD 8.0-STABLE
>Organization:
Officialunix
>Environment:
FreeBSD cpet.gateway.2wire.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Mon Mar 29 10:26:36 CST 2010 root@cpet.gateway.2wire.net:/usr/obj/usr/src/sys/cpet amd64
>Description:
Port defaults to install gcc 4.2 regardless. Fix this by adding a OSVERSION addition for anything below 700042 (the internal version when gcc 4.2 was added)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: peekabot/Makefile
===================================================================
RCS file: /usr/local/freebsdncvs/ports/science/peekabot/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- peekabot/Makefile 29 Mar 2010 20:26:26 -0000 1.15
+++ peekabot/Makefile 1 Apr 2010 05:28:59 -0000
@@ -7,7 +7,7 @@
PORTNAME= peekabot
PORTVERSION= 0.7.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.7.x/ \
http://distfiles.officialunix.com/
@@ -25,10 +25,16 @@
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GCC= 4.2+
+
+.include <bsd.port.pre.mk>
+
+#No need to force usage of GCC 4.2 if anything < 7.0 already has it.
+.if ${OSVERSION} < 700042
+USE_GCC= 4.2+
+.endif
post-patch:
${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
${WRKSRC}/src/3rdparty/png++/io_base.hpp
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004010546.o315kc3Y053379>