sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix the build on -CURRENT ;

Browse source 
- Since I'm there, define LICENSE and split PORTDOCS/PORTEXAMPLES.

PR:		ports/181759
Submitted by:	tijl
This commit is contained in:
Thierry Thomas 2013-09-02 17:47:54 +00:00
parent 6009aff0ca
commit c2c4c7bd1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=326044
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
graphics/SciPlot/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= SciPlot PORTNAME= SciPlot
PORTVERSION= 1.36 PORTVERSION= 1.36
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= graphics math CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets MASTER_SITE_SUBDIR= widgets
@ -11,8 +11,10 @@ MASTER_SITE_SUBDIR= widgets
MAINTAINER= thierry@FreeBSD.org MAINTAINER= thierry@FreeBSD.org
COMMENT= Full-featured Xt widget to display 2D data in a graph COMMENT= Full-featured Xt widget to display 2D data in a graph
LICENSE= GPLv2
USES= imake motif USES= imake motif
USE_XORG= xp USE_XORG= xp xt x11
MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME} MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
USE_LDCONFIG= yes USE_LDCONFIG= yes
@ -36,6 +38,8 @@ post-install:
${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
.if !defined(NOPORTEXAMPLES)
${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${EXDATA:S|^|${WRKSRC}/|} ${EXAMPLESDIR} ${INSTALL_DATA} ${EXDATA:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
${INSTALL_PROGRAM} ${EXBINS:S|^|${WRKSRC}/|} ${EXAMPLESDIR} ${INSTALL_PROGRAM} ${EXBINS:S|^|${WRKSRC}/|} ${EXAMPLESDIR}

15
graphics/SciPlot/files/patch-Imakefile
View file

@ -18,7 +18,7 @@
MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB) -MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
+# MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB) +MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB)
SYS_LIBRARIES = -lm SYS_LIBRARIES = -lm
CDEBUGFLAGS = CDEBUGFLAGS =
@ -32,20 +32,15 @@
SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c
HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
@@ -54,10 +58,10 @@ @@ -54,7 +58,7 @@
$(HDOC) $*.hdoc > $*.html $(HDOC) $*.hdoc > $*.html
-AllTarget(sciplot realtime) -AllTarget(sciplot realtime)
+AllTarget(sciplot realtime libs) +AllTarget(sciplot realtime libs)
-NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
-NormalProgramTarget(realtime,$(RTOBJS),$(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."
@@ -79,9 +83,16 @@ @@ -79,9 +83,16 @@
tar cfv $(TARFILE).tar $(TARFILES) tar cfv $(TARFILE).tar $(TARFILES)
compress $(TARFILE).tar compress $(TARFILE).tar
@ -54,7 +49,7 @@
+ $(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o + $(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o
+ $(RANLIB) $(LIBNAME).a + $(RANLIB) $(LIBNAME).a
+ $(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o \ + $(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o \
+ $(LDFLAGS) $(MOTIFLIB) $(LDLIBS) + $(LDFLAGS) $(MOTIFLIBS) $(LDLIBS)
+ +
# Dependencies: # Dependencies:

8
graphics/SciPlot/pkg-plist
View file

@ -4,8 +4,8 @@ include/SciPlot/SciPlotUtil.h
lib/%%LIBNAME%%.a lib/%%LIBNAME%%.a
lib/%%LIBNAME%%.so lib/%%LIBNAME%%.so
lib/%%LIBNAME%%.so.0 lib/%%LIBNAME%%.so.0
%%PORTDOCS%%%%EXAMPLESDIR%%/data.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/data.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/realtime %%PORTEXAMPLES%%%%EXAMPLESDIR%%/realtime
%%PORTDOCS%%%%EXAMPLESDIR%%/sciplot %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sciplot
@dirrm include/SciPlot @dirrm include/SciPlot
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%