From owner-svn-ports-all@FreeBSD.ORG Mon Sep 2 17:47:56 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D923D56C; Mon, 2 Sep 2013 17:47:55 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C65A225B5; Mon, 2 Sep 2013 17:47:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r82Hltd0022667; Mon, 2 Sep 2013 17:47:55 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r82Hlt7J022664; Mon, 2 Sep 2013 17:47:55 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201309021747.r82Hlt7J022664@svn.freebsd.org> From: Thierry Thomas Date: Mon, 2 Sep 2013 17:47:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326044 - in head/graphics/SciPlot: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2013 17:47:56 -0000 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%%