From tijl@coosemans.org  Mon Sep  2 16:28:44 2013
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 23A514C2
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Sep 2013 16:28:44 +0000 (UTC)
	(envelope-from tijl@coosemans.org)
Received: from mailrelay001.isp.belgacom.be (mailrelay001.isp.belgacom.be [195.238.6.51])
	by mx1.freebsd.org (Postfix) with ESMTP id B4ED12FA0
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Sep 2013 16:28:43 +0000 (UTC)
Received: from 197.77-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.77.197])
  by relay.skynet.be with ESMTP; 02 Sep 2013 18:28:35 +0200
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id r82GSYIv055820
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 2 Sep 2013 18:28:34 +0200 (CEST)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id r82GSY7h055819;
	Mon, 2 Sep 2013 18:28:34 +0200 (CEST)
	(envelope-from tijl)
Message-Id: <201309021628.r82GSY7h055819@kalimero.tijl.coosemans.org>
Date: Mon, 2 Sep 2013 18:28:34 +0200 (CEST)
From: Tijl Coosemans <tijl@FreeBSD.org>
Reply-To: Tijl Coosemans <tijl@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] graphics/SciPlot: fix build on current
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         181759
>Category:       ports
>Synopsis:       [patch] graphics/SciPlot: fix build on current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 02 16:30:00 UTC 2013
>Closed-Date:    Mon Sep 02 17:48:38 UTC 2013
>Last-Modified:  Mon Sep  2 17:50:00 UTC 2013
>Originator:     Tijl Coosemans
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
Fails to build on current:
http://pb2.nyi.freebsd.org/bulk/nogcc-default/2013-09-01_22h32m11s/logs/errors/SciPlot-1.36_3.log
>How-To-Repeat:
>Fix:
Modify patch-Imakefile to use MOTIFLIBS again instead of MOTIFLIB.
Include -lXt and -lX11 in MOTIFLIBS.  This fixes the build on current
where all required libraries need to be explicitly linked in.

--- sciplot.patch begins here ---
Index: graphics/SciPlot/Makefile
===================================================================
--- graphics/SciPlot/Makefile	(revision 325982)
+++ graphics/SciPlot/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	SciPlot
 PORTVERSION=	1.36
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets
@@ -12,7 +12,7 @@ MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Full-featured Xt widget to display 2D data in a graph
 
 USES=		imake motif
-USE_XORG=	xp
+USE_XORG=	xp xt x11
 MAKE_ENV=	EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
 USE_LDCONFIG=	yes
 
Index: graphics/SciPlot/files/patch-Imakefile
===================================================================
--- graphics/SciPlot/files/patch-Imakefile	(revision 325982)
+++ graphics/SciPlot/files/patch-Imakefile	(working copy)
@@ -18,7 +18,7 @@
  
  MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
 -MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+# MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
++MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB)
  SYS_LIBRARIES = -lm
  CDEBUGFLAGS = 
  
@@ -32,20 +32,15 @@
  SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c
  HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h
  OBJS = $(SRCS:.c=.o)
-@@ -54,10 +58,10 @@
+@@ -54,7 +58,7 @@
  	$(HDOC) $*.hdoc > $*.html
  
  
 -AllTarget(sciplot realtime)
 +AllTarget(sciplot realtime libs)
  
--NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
--NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
-+NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES))
-+NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES))
- 
- doc:	$(HOBJS) $(HDOC)
- 	@echo "Updated html."
+ NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
+ NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
 @@ -79,9 +83,16 @@
  	tar cfv $(TARFILE).tar $(TARFILES)
  	compress $(TARFILE).tar
@@ -54,7 +49,7 @@
 +	$(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o
 +	$(RANLIB) $(LIBNAME).a
 +	$(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o	\
-+		$(LDFLAGS) $(MOTIFLIB) $(LDLIBS)
++		$(LDFLAGS) $(MOTIFLIBS) $(LDLIBS)
 +
  # Dependencies:
  
--- sciplot.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Sep 2 16:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181759 
State-Changed-From-To: open->closed 
State-Changed-By: thierry 
State-Changed-When: lun 2 sep 2013 17:48:15 UTC 
State-Changed-Why:  

Committed, thanks! 


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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181759: commit references a PR
Date: Mon,  2 Sep 2013 17:48:08 +0000 (UTC)

 Author: thierry
 Date: Mon Sep  2 17:47:54 2013
 New Revision: 326044
 URL: http://svnweb.freebsd.org/changeset/ports/326044
 
 Log:
   - Fix the build on -CURRENT ;
   
   - Since I'm there, define LICENSE and split PORTDOCS/PORTEXAMPLES.
   
   PR:		ports/181759
   Submitted by:	tijl
 
 Modified:
   head/graphics/SciPlot/Makefile   (contents, props changed)
   head/graphics/SciPlot/files/patch-Imakefile   (contents, props changed)
   head/graphics/SciPlot/pkg-plist   (contents, props changed)
 
 Modified: head/graphics/SciPlot/Makefile
 ==============================================================================
 --- head/graphics/SciPlot/Makefile	Mon Sep  2 17:37:56 2013	(r326043)
 +++ head/graphics/SciPlot/Makefile	Mon Sep  2 17:47:54 2013	(r326044)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	SciPlot
  PORTVERSION=	1.36
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	graphics math
  MASTER_SITES=	${MASTER_SITE_XCONTRIB}
  MASTER_SITE_SUBDIR=	widgets
 @@ -11,8 +11,10 @@ MASTER_SITE_SUBDIR=	widgets
  MAINTAINER=	thierry@FreeBSD.org
  COMMENT=	Full-featured Xt widget to display 2D data in a graph
  
 +LICENSE=	GPLv2
 +
  USES=		imake motif
 -USE_XORG=	xp
 +USE_XORG=	xp xt x11
  MAKE_ENV=	EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
  USE_LDCONFIG=	yes
  
 @@ -36,6 +38,8 @@ post-install:
  	${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
  	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 +.endif
 +.if !defined(NOPORTEXAMPLES)
  	${MKDIR} ${EXAMPLESDIR}
  	${INSTALL_DATA} ${EXDATA:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
  	${INSTALL_PROGRAM} ${EXBINS:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
 
 Modified: head/graphics/SciPlot/files/patch-Imakefile
 ==============================================================================
 --- head/graphics/SciPlot/files/patch-Imakefile	Mon Sep  2 17:37:56 2013	(r326043)
 +++ head/graphics/SciPlot/files/patch-Imakefile	Mon Sep  2 17:47:54 2013	(r326044)
 @@ -18,7 +18,7 @@
   
   MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
  -MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
 -+# MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
 ++MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB)
   SYS_LIBRARIES = -lm
   CDEBUGFLAGS = 
   
 @@ -32,20 +32,15 @@
   SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c
   HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h
   OBJS = $(SRCS:.c=.o)
 -@@ -54,10 +58,10 @@
 +@@ -54,7 +58,7 @@
   	$(HDOC) $*.hdoc > $*.html
   
   
  -AllTarget(sciplot realtime)
  +AllTarget(sciplot realtime libs)
   
 --NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
 --NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
 -+NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES))
 -+NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES))
 - 
 - doc:	$(HOBJS) $(HDOC)
 - 	@echo "Updated html."
 + NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
 + NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
  @@ -79,9 +83,16 @@
   	tar cfv $(TARFILE).tar $(TARFILES)
   	compress $(TARFILE).tar
 @@ -54,7 +49,7 @@
  +	$(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o
  +	$(RANLIB) $(LIBNAME).a
  +	$(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o	\
 -+		$(LDFLAGS) $(MOTIFLIB) $(LDLIBS)
 ++		$(LDFLAGS) $(MOTIFLIBS) $(LDLIBS)
  +
   # Dependencies:
   
 
 Modified: head/graphics/SciPlot/pkg-plist
 ==============================================================================
 --- head/graphics/SciPlot/pkg-plist	Mon Sep  2 17:37:56 2013	(r326043)
 +++ head/graphics/SciPlot/pkg-plist	Mon Sep  2 17:47:54 2013	(r326044)
 @@ -4,8 +4,8 @@ include/SciPlot/SciPlotUtil.h
  lib/%%LIBNAME%%.a
  lib/%%LIBNAME%%.so
  lib/%%LIBNAME%%.so.0
 -%%PORTDOCS%%%%EXAMPLESDIR%%/data.txt
 -%%PORTDOCS%%%%EXAMPLESDIR%%/realtime
 -%%PORTDOCS%%%%EXAMPLESDIR%%/sciplot
 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data.txt
 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/realtime
 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sciplot
  @dirrm include/SciPlot
 -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 _______________________________________________
 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:
