diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile index 5bb0b3595ce4..b64412397a47 100644 --- a/comms/xnecview/Makefile +++ b/comms/xnecview/Makefile @@ -1,23 +1,25 @@ PORTNAME= xnecview -PORTVERSION= 1.36 -PORTREVISION= 4 +DISTVERSION= 1.37 CATEGORIES= comms hamradio -MASTER_SITES= http://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/ +MASTER_SITES= https://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/ MAINTAINER= xride@FreeBSD.org COMMENT= X11 viewer of NEC2 input and output data WWW= https://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libpng.so:graphics/png USES= gmake gnome pkgconfig tar:tgz USE_GNOME= gtk20 PLIST_FILES= bin/xnecview share/man/man1/xnecview.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xnecview ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xnecview.man \ ${STAGEDIR}${PREFIX}/share/man/man1/xnecview.1 .include diff --git a/comms/xnecview/distinfo b/comms/xnecview/distinfo index 5b6fda5d2f6e..52de3cdfa90b 100644 --- a/comms/xnecview/distinfo +++ b/comms/xnecview/distinfo @@ -1,2 +1,3 @@ -SHA256 (xnecview-1.36.tgz) = be2837cedb1526b90f846c3205503858c7471434c678dcd9ce848415dfd76e86 -SIZE (xnecview-1.36.tgz) = 79535 +TIMESTAMP = 1742329895 +SHA256 (xnecview-1.37.tgz) = 4e2cefa5887260845a09d44edab5ff9799d5d091857cf8af0a9a590cf35951f0 +SIZE (xnecview-1.37.tgz) = 79005 diff --git a/comms/xnecview/files/patch-Makefile b/comms/xnecview/files/patch-Makefile index 2492b0a3a034..3fad29347c07 100644 --- a/comms/xnecview/files/patch-Makefile +++ b/comms/xnecview/files/patch-Makefile @@ -1,24 +1,24 @@ ---- Makefile.orig Mon Mar 27 22:38:37 2006 -+++ Makefile Mon Jun 5 15:37:15 2006 -@@ -3,15 +3,16 @@ +--- Makefile.orig 2006-03-27 20:38:37 UTC ++++ Makefile +@@ -3,15 +3,16 @@ PNG = yes -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 -LDFLAGS += -lpng +CFLAGS += `pkg-config --cflags libpng` +LDFLAGS += `pkg-config --libs libpng` endif SRCS = xnecview.c xwin.c parse_input.c parse_output.c draw.c draw_opaque.c freqplot.c postscript.c icon.xbm diff --git a/comms/xnecview/files/patch-draw.c b/comms/xnecview/files/patch-draw.c index c0c550306b92..b660982b7ae1 100644 --- a/comms/xnecview/files/patch-draw.c +++ b/comms/xnecview/files/patch-draw.c @@ -1,11 +1,11 @@ ---- draw.c.orig Mon Jul 21 21:49:28 2003 -+++ draw.c Fri Mar 17 17:59:24 2006 -@@ -605,7 +605,7 @@ +--- draw.c.orig 2020-01-11 15:14:27 UTC ++++ draw.c +@@ -615,7 +615,7 @@ void draw_gain_phi(int j,Radpattern *rp) #define R270 (1.5*M_PI) #define R360 (2*M_PI) -#include +#include void draw_gain(int ie,Radpattern *rp) { diff --git a/comms/xnecview/files/patch-parse_input.c b/comms/xnecview/files/patch-parse_input.c index e3473abe3e32..3a20f4bbf0eb 100644 --- a/comms/xnecview/files/patch-parse_input.c +++ b/comms/xnecview/files/patch-parse_input.c @@ -1,19 +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 @@ +--- parse_input.c.orig 2020-01-12 14:16:26 UTC ++++ parse_input.c +@@ -525,6 +525,7 @@ int read_nec_SC(char *s) /* SC -> continuation of 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 @@ +@@ -573,7 +574,7 @@ int read_nec_SC(char *s) /* SC -> continuation of 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); diff --git a/comms/xnecview/files/patch-xwin.c b/comms/xnecview/files/patch-xwin.c deleted file mode 100644 index 6d56247a50ce..000000000000 --- a/comms/xnecview/files/patch-xwin.c +++ /dev/null @@ -1,11 +0,0 @@ ---- xwin.c.orig 2011-07-26 00:03:37.000000000 +0200 -+++ xwin.c 2012-05-01 08:33:19.000000000 +0200 -@@ -277,7 +277,7 @@ - fclose(f); - return 1; - } -- if (setjmp(pp->jmpbuf)) { -+ if (setjmp(png_jmpbuf(pp))) { - png_destroy_write_struct(&pp,&ip); - fclose(f); - gdk_image_destroy(image); diff --git a/comms/xnecview/pkg-descr b/comms/xnecview/pkg-descr index e1b286f5165e..c5e037ed4f0b 100644 --- a/comms/xnecview/pkg-descr +++ b/comms/xnecview/pkg-descr @@ -1,3 +1,3 @@ Xnecview is a program for visualizing the input and output files of the NEC -antenna simulation software. It runs on Linux/Unix systems with the X window -system. +antenna simulation software. It runs on GNU/Linux and Unix systems with the +X window system.