From tkato432@yahoo.com  Sat Jan  5 18:03:54 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 6CC3FB9A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  5 Jan 2013 18:03:49 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165])
	by mx1.freebsd.org (Postfix) with ESMTP id 169B99D3
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  5 Jan 2013 18:03:49 +0000 (UTC)
Received: from localhost.localdomain (ZT034245.ppp.dion.ne.jp [59.128.34.245])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id D24A84AC036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  6 Jan 2013 03:03:46 +0900 (JST)
Message-Id: <20130106023506.ec114520fdd258470dc320a9@yahoo.com>
Date: Sun, 6 Jan 2013 02:35:06 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: science/linsmith: Fix build with clang

>Number:         175022
>Category:       ports
>Synopsis:       science/linsmith: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 18:10:05 UTC 2013
>Closed-Date:    Thu Feb 07 14:37:20 UTC 2013
>Last-Modified:  Thu Feb  7 14:40:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: araujo 
Responsible-Changed-When: Fri Jan 18 06:10:47 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175022 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Feb 7 14:36:56 UTC 2013 
State-Changed-Why:  
Take 


Responsible-Changed-From-To: araujo->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Feb 7 14:36:56 UTC 2013 
Responsible-Changed-Why:  
Committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175022 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175022: commit references a PR
Date: Thu,  7 Feb 2013 14:37:07 +0000 (UTC)

 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@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%%
 +@dirrmtry share/applications
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
