- Update to 0.99.25

PR:		179593
Submitted by:	Ports Fury

5 files changed, 7 insertions, 39 deletions

diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index 5ee5b83d20be..db9a00ad9414 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	linsmith
-PORTVERSION=	0.99.24
-PORTREVISION=	1
+PORTVERSION=	0.99.25
 CATEGORIES=	science hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -12,8 +11,8 @@ COMMENT=	Smith charting program
 
 LICENSE=	GPLv2 # (or later)
 
+USES=		gettext
 USE_GNOME=	libgnomeui libxml2
-USES=		gettext iconv
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
@@ -21,9 +20,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${CP} ${FILESDIR}/carg.c  ${WRKSRC}/src
 	@${REINPLACE_CMD} -e \
-		'/^Icon/s|=.*|=linsmith_icon|' ${WRKSRC}/linsmith.desktop
+		'/^Icon/s|/usr/share|${PREFIX}/share|' \
+		${WRKSRC}/linsmith.desktop
 
 post-install:
 	@${MKDIR} ${DESKTOPDIR}
diff --git a/science/linsmith/distinfo b/science/linsmith/distinfo
index 8f824bbad432..8ecd8b1d2366 100644
--- a/science/linsmith/distinfo
+++ b/science/linsmith/distinfo
@@ -1,2 +1,2 @@
-SHA256 (linsmith-0.99.24.tar.gz) = f2e124240bc14cc918b8ff3336bf4579fca91770aaa8ddbef0828c48f1a90ea1
-SIZE (linsmith-0.99.24.tar.gz) = 1138827
+SHA256 (linsmith-0.99.25.tar.gz) = 446f3f8646c78e2f4fb49bf2cec626e98bb57d253c8a455feff28e813501ca4c
+SIZE (linsmith-0.99.25.tar.gz) = 1130652
diff --git a/science/linsmith/files/carg.c b/science/linsmith/files/carg.c
deleted file mode 100644
index 0e021032c0dd..000000000000
--- a/science/linsmith/files/carg.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* carg.f -- translated by f2c (version 20000817).
-*/
-#include <math.h>
-#include <complex.h>
-
-double carg(complex z__)
-{
-    /* System generated locals */
-    double ret_val;
-
-/* april 1977 version.  w. fullerton, c3, los alamos scientific lab. */
-
-    ret_val = (float)0.;
-    if (creal(z__) != (float)0. || cimag(z__) != (float)0.) {
-	ret_val = atan2(cimag(z__), creal(z__));
-    }
-
-    return ret_val;
-} /* carg */
-
diff --git a/science/linsmith/files/patch-src-Makefile.in b/science/linsmith/files/patch-src-Makefile.in
deleted file mode 100644
index 7ea364c9f485..000000000000
--- a/science/linsmith/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	2012-12-04 14:04:33.180175876 -0600
-+++ src/Makefile.in	2012-12-04 14:04:48.896176479 -0600
-@@ -67,7 +67,7 @@
- 	element.$(OBJEXT) remote.$(OBJEXT) import.$(OBJEXT) \
- 	load.$(OBJEXT) load_rx.$(OBJEXT) load_nb.$(OBJEXT) \
- 	log.$(OBJEXT) support.$(OBJEXT) printer.$(OBJEXT) \
--	interface.$(OBJEXT) callbacks.$(OBJEXT) cables.$(OBJEXT)
-+	interface.$(OBJEXT) callbacks.$(OBJEXT) cables.$(OBJEXT) carg.$(OBJEXT)
- linsmith_OBJECTS = $(am_linsmith_OBJECTS)
- am__DEPENDENCIES_1 =
- linsmith_DEPENDENCIES = $(am__DEPENDENCIES_1)
diff --git a/science/linsmith/files/patch-src__remote.c b/science/linsmith/files/patch-src__remote.c
index 97cfd317541b..90085d619595 100644
--- a/science/linsmith/files/patch-src__remote.c
+++ b/science/linsmith/files/patch-src__remote.c
@@ -5,7 +5,7 @@
  {
    // if not even enabled manually, just go away
 -  if (pref.rem_mode != REMOTE_SOCK) return;
-+  if (pref.rem_mode != REMOTE_SOCK) return 0;
++  if (pref.rem_mode != REMOTE_SOCK) return FALSE;
    
  printf("Removing the remote pipes\n");
    close(pref.inpipe);