svn commit: r326044 - in head/graphics/SciPlot: . files

[Thierry Thomas]

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 at 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%%