diff options
| author | novel <novel@FreeBSD.org> | 2006-06-05 21:59:38 +0800 |
|---|---|---|
| committer | novel <novel@FreeBSD.org> | 2006-06-05 21:59:38 +0800 |
| commit | 10ec74d3007e43bc0607a4e3b314ebb7379f0df8 (patch) | |
| tree | 0534b5e27f78a7ed707b82c587e4b353190f51bf | |
| parent | ea036b67e685931bfd644b8f652a43555f62ee89 (diff) | |
| download | freebsd-ports-gnome-10ec74d3007e43bc0607a4e3b314ebb7379f0df8.tar.gz freebsd-ports-gnome-10ec74d3007e43bc0607a4e3b314ebb7379f0df8.tar.zst freebsd-ports-gnome-10ec74d3007e43bc0607a4e3b314ebb7379f0df8.zip | |
- Fix build on 4.x
- Respect CC
PR: 98523 (based on)
Submitted by: Soeren Straarup (maintainer)
| -rw-r--r-- | comms/xnecview/Makefile | 2 | ||||
| -rw-r--r-- | comms/xnecview/files/patch-Makefile | 18 | ||||
| -rw-r--r-- | comms/xnecview/files/patch-parse_input.c | 19 |
3 files changed, 36 insertions, 3 deletions
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile index faefcae34822..2d3d6b8451af 100644 --- a/comms/xnecview/Makefile +++ b/comms/xnecview/Makefile @@ -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 diff --git a/comms/xnecview/files/patch-Makefile b/comms/xnecview/files/patch-Makefile index be9d4cb1df37..9d6137bffffa 100644 --- a/comms/xnecview/files/patch-Makefile +++ b/comms/xnecview/files/patch-Makefile @@ -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 diff --git a/comms/xnecview/files/patch-parse_input.c b/comms/xnecview/files/patch-parse_input.c new file mode 100644 index 000000000000..e3473abe3e32 --- /dev/null +++ b/comms/xnecview/files/patch-parse_input.c @@ -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); |