Date: Sun, 6 Jan 2013 02:35:06 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/175022: science/linsmith: Fix build with clang Message-ID: <20130106023506.ec114520fdd258470dc320a9@yahoo.com> Resent-Message-ID: <201301051810.r05IA6Bm001522@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175022
>Category: ports
>Synopsis: science/linsmith: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 05 18:10:05 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Install desktop entry file
New file:
files/patch-src__element.c
files/patch-src__remote.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/science/linsmith/Makefile science/linsmith/Makefile
--- /usr/ports/science/linsmith/Makefile 2012-12-05 20:21:34.000000000 +0900
+++ science/linsmith/Makefile 2013-01-06 02:26:46.000000000 +0900
@@ -3,26 +3,34 @@
PORTNAME= linsmith
PORTVERSION= 0.99.24
+PORTREVISION= 1
CATEGORIES= science hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Smith charting program
-LICENSE= GPLv2 GPLv3
-LICENSE_COMB= dual
+LICENSE= GPLv2 # (or later)
USE_GNOME= libgnomeui libxml2
USE_ICONV= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-USE_GCC= any
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
+
+post-install:
+ @${MKDIR} ${DESKTOPDIR}
+ (cd ${WRKSRC} \
+ && ${INSTALL_DATA} linsmith.desktop ${DESKTOPDIR})
+ (cd ${WRKSRC} \
+ && ${INSTALL_DATA} linsmith_icon.xpm ${PREFIX}/share/pixmaps)
.include <bsd.port.mk>
diff -urN /usr/ports/science/linsmith/files/patch-src__element.c science/linsmith/files/patch-src__element.c
--- /usr/ports/science/linsmith/files/patch-src__element.c 1970-01-01 09:00:00.000000000 +0900
+++ science/linsmith/files/patch-src__element.c 2012-10-21 04:48:20.000000000 +0900
@@ -0,0 +1,10 @@
+--- src/element.c.orig 2011-06-23 01:10:42.000000000 +0900
++++ src/element.c 2012-10-21 04:47:51.000000000 +0900
+@@ -306,6 +306,7 @@
+ }
+
+
++void
+ clear_element_lnlist(chart_lnlist *lnlst)
+ {
+ GList *l;
diff -urN /usr/ports/science/linsmith/files/patch-src__remote.c science/linsmith/files/patch-src__remote.c
--- /usr/ports/science/linsmith/files/patch-src__remote.c 1970-01-01 09:00:00.000000000 +0900
+++ science/linsmith/files/patch-src__remote.c 2012-10-21 04:54:18.000000000 +0900
@@ -0,0 +1,11 @@
+--- src/remote.c.orig 2007-11-12 12:09:03.000000000 +0900
++++ src/remote.c 2012-10-21 04:50:16.000000000 +0900
+@@ -36,7 +36,7 @@
+ remove_fifos(gpointer data)
+ {
+ // if not even enabled manually, just go away
+- if (pref.rem_mode != REMOTE_SOCK) return;
++ if (pref.rem_mode != REMOTE_SOCK) return 0;
+
+ printf("Removing the remote pipes\n");
+ close(pref.inpipe);
diff -urN /usr/ports/science/linsmith/pkg-plist science/linsmith/pkg-plist
--- /usr/ports/science/linsmith/pkg-plist 2012-12-05 20:21:34.000000000 +0900
+++ science/linsmith/pkg-plist 2013-01-06 02:24:29.000000000 +0900
@@ -1,4 +1,5 @@
bin/linsmith
+share/applications/linsmith.desktop
%%DATADIR%%/6-1.circ
%%DATADIR%%/6-4.circ
%%DATADIR%%/6-4.load
@@ -20,7 +21,9 @@
share/locale/it/LC_MESSAGES/linsmith.mo
share/locale/sv/LC_MESSAGES/linsmith.mo
share/locale/zh/LC_MESSAGES/linsmith.mo
+share/pixmaps/linsmith_icon.xpm
share/pixmaps/linsmith/smith4.png
share/pixmaps/linsmith/smithent.png
@dirrm share/pixmaps/linsmith
@dirrm %%DATADIR%%
+@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130106023506.ec114520fdd258470dc320a9>