svn commit: r311851 - in head/science/linsmith: . files

[Martin Wilke]

Author: miwi
Date: Thu Feb  7 14:36:55 2013
New Revision: 311851
URL: http://svnweb.freebsd.org/changeset/ports/311851

Log:
  - Fix build with clang
  
  PR:		175022
  Submitted by:	Ports Fury

Added:
  head/science/linsmith/files/patch-src__element.c   (contents, props changed)
  head/science/linsmith/files/patch-src__remote.c   (contents, props changed)
Modified:
  head/science/linsmith/Makefile   (contents, props changed)
  head/science/linsmith/pkg-plist   (contents, props changed)

Modified: head/science/linsmith/Makefile
==============================================================================
--- head/science/linsmith/Makefile	Thu Feb  7 14:35:38 2013	(r311850)
+++ head/science/linsmith/Makefile	Thu Feb  7 14:36:55 2013	(r311851)
@@ -3,26 +3,34 @@
 
 PORTNAME=	linsmith
 PORTVERSION=	0.99.24
+PORTREVISION=	1
 CATEGORIES=	science hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	ports at 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>

Added: head/science/linsmith/files/patch-src__element.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/linsmith/files/patch-src__element.c	Thu Feb  7 14:36:55 2013	(r311851)
@@ -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;

Added: head/science/linsmith/files/patch-src__remote.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/linsmith/files/patch-src__remote.c	Thu Feb  7 14:36:55 2013	(r311851)
@@ -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);

Modified: head/science/linsmith/pkg-plist
==============================================================================
--- head/science/linsmith/pkg-plist	Thu Feb  7 14:35:38 2013	(r311850)
+++ head/science/linsmith/pkg-plist	Thu Feb  7 14:36:55 2013	(r311851)
@@ -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/hu/LC_MESSAGES/linsmith.mo
 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%%
+ at dirrmtry share/applications