1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

- Fix build on 4.x

- Respect CC

PR:		98523 (based on)
Submitted by:	Soeren Straarup (maintainer)
This commit is contained in:
Roman Bogorodskiy 2006-06-05 13:59:38 +00:00
parent dcb70017d9
commit 2f1df2f8be
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=164449
3 changed files with 36 additions and 3 deletions

View File

@ -21,6 +21,8 @@ USE_GNOME= gtk20
USE_GMAKE= yes
USE_X_PREFIX= yes
MAKE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= xnecview.1
PLIST_FILES= bin/xnecview

View File

@ -1,6 +1,18 @@
--- 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 15:37:15 2006
@@ -3,15 +3,16 @@
-CC = gcc
-CFLAGS = -O2 -g -Wall `pkg-config gtk+-2.0 --cflags`
+CC ?= gcc
+CFLAGS += `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

View File

@ -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);