Date: Mon, 5 Jun 2006 12:41:10 +0200 (CEST) From: Soeren Straarup <xride@x12.dk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98523: [MAINTAINER-PATCH] comms/xnecview: [Mark broken for less then 5.x] Message-ID: <20060605104110.913CF4259@beacon.x12.dk> Resent-Message-ID: <200606051050.k55AoKxJ008756@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98523
>Category: ports
>Synopsis: [MAINTAINER-PATCH] comms/xnecview: [Mark broken for less then 5.x]
>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: Mon Jun 05 10:50:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Soeren Straarup
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD beacon.x12.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Tue Feb 7 20:11:22 CET
>Description:
Mark broken for OSVERSION lower than 5.x
due to getops doesn't work well on 4.X
Make a minor c declaration fix.
Added file(s):
- files/patch-parse_input.c
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- xnecview-1.35.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/comms/xnecview/Makefile /space/portstrees/FreeBSD/ports/comms/xnecview/Makefile
--- /usr/ports/comms/xnecview/Makefile Sat Jun 3 20:28:36 2006
+++ /space/portstrees/FreeBSD/ports/comms/xnecview/Makefile Mon Jun 5 12:20:38 2006
@@ -24,8 +24,14 @@
MAN1= xnecview.1
PLIST_FILES= bin/xnecview
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+IGNORE= does not build on FreeBSD 4.x
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xnecview ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xnecview.man ${MANPREFIX}/man/man1/xnecview.1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/comms/xnecview/files/patch-Makefile /space/portstrees/FreeBSD/ports/comms/xnecview/files/patch-Makefile
--- /usr/ports/comms/xnecview/files/patch-Makefile Sat Jun 3 20:28:36 2006
+++ /space/portstrees/FreeBSD/ports/comms/xnecview/files/patch-Makefile Mon Jun 5 09:33:55 2006
@@ -1,6 +1,16 @@
---- Makefile.orig Fri May 26 21:40:46 2006
-+++ Makefile Fri May 26 21:42:42 2006
-@@ -11,7 +11,8 @@
+--- Makefile.orig Mon Mar 27 22:38:37 2006
++++ Makefile Mon Jun 5 09:33:53 2006
+@@ -4,14 +4,15 @@
+
+
+ CC = gcc
+-CFLAGS = -O2 -g -Wall `pkg-config gtk+-2.0 --cflags`
++CFLAGS += -O2 -Wall `pkg-config gtk+-2.0 --cflags`
+
+-LD = $(CC)
+-LDFLAGS = `pkg-config gtk+-2.0 --libs` -lm
++LD += $(CC)
++LDFLAGS += `pkg-config gtk+-2.0 --libs` -lm
ifeq ($(PNG),yes)
CFLAGS += -DHAVE_LIBPNG
diff -ruN --exclude=CVS /usr/ports/comms/xnecview/files/patch-parse_input.c /space/portstrees/FreeBSD/ports/comms/xnecview/files/patch-parse_input.c
--- /usr/ports/comms/xnecview/files/patch-parse_input.c Thu Jan 1 01:00:00 1970
+++ /space/portstrees/FreeBSD/ports/comms/xnecview/files/patch-parse_input.c Mon Jun 5 08:58:44 2006
@@ -0,0 +1,19 @@
+--- parse_input.c.orig Mon Jun 5 08:56:55 2006
++++ parse_input.c Mon Jun 5 08:57:56 2006
+@@ -527,6 +527,7 @@
+ int read_nec_SC(char *s) /* SC -> continuation of SM, SP, or SC */
+ {
+ Surface *su;
++ Surface *suLast;
+ int ns;
+ Point p3;
+ int n;
+@@ -575,7 +576,7 @@
+ case 'C':
+ n=sscanf(s,"SC%*i%d%g%g%g%g%g%g",&ns,&su->p2.x,&su->p2.y,&su->p2.z,&su->p3.x,&su->p3.y,&su->p3.z);
+ if (n!=7 && n!=4) return Err_scan;
+- Surface *suLast=surfaces+(numsurfaces-2);
++ suLast=surfaces+(numsurfaces-2);
+ su->p0=suLast->p3;
+ su->p1=suLast->p2;
+ updateextremes(&su->p2);
--- xnecview-1.35.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060605104110.913CF4259>