Attachment #136518 for bug #181759

View | Details | Raw Unified | Return to bug 181759
Collapse All | Expand All

Lines 3-9 Link Here

(-)graphics/SciPlot/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= SciPlot	4	PORTNAME= SciPlot
5	PORTVERSION= 1.36	5	PORTVERSION= 1.36
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= graphics math	7	CATEGORIES= graphics math
8	MASTER_SITES= ${MASTER_SITE_XCONTRIB}	8	MASTER_SITES= ${MASTER_SITE_XCONTRIB}
9	MASTER_SITE_SUBDIR= widgets	9	MASTER_SITE_SUBDIR= widgets
Lines 12-18 MAINTAINER= thierry@FreeBSD.org Link Here
12	COMMENT= Full-featured Xt widget to display 2D data in a graph	12	COMMENT= Full-featured Xt widget to display 2D data in a graph
13		13
14	USES= imake motif	14	USES= imake motif
15	USE_XORG= xp	15	USE_XORG= xp xt x11
16	MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}	16	MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
17	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
18		18




 
 MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
+MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB)
 SYS_LIBRARIES = -lm
 CDEBUGFLAGS = 
 

 SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c
 HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h
 OBJS = $(SRCS:.c=.o)
@@ -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."
@@ -79,9 +83,16 @@
 	tar cfv $(TARFILE).tar $(TARFILES)
 	compress $(TARFILE).tar

+	$(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o
+	$(RANLIB) $(LIBNAME).a
+	$(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o	\
+		$(LDFLAGS) $(MOTIFLIBS) $(LDLIBS)
+
 # Dependencies:

Return to bug 181759

Lines 18-24 Link Here

(-)graphics/SciPlot/files/patch-Imakefile (-10 / +5 lines)
18		18
19	MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)	19	MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
20	-MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)	20	-MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)
21	+# MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB)	21	+MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB)
22	SYS_LIBRARIES = -lm	22	SYS_LIBRARIES = -lm
23	CDEBUGFLAGS =	23	CDEBUGFLAGS =
24		24
Lines 32-51 Link Here
32	SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c	32	SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c
33	HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h	33	HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h
34	OBJS = $(SRCS:.c=.o)	34	OBJS = $(SRCS:.c=.o)
35	@@ -54,10 +58,10 @@	35	@@ -54,7 +58,7 @@
36	$(HDOC) $.hdoc > $.html	36	$(HDOC) $.hdoc > $.html
37		37
38		38
39	-AllTarget(sciplot realtime)	39	-AllTarget(sciplot realtime)
40	+AllTarget(sciplot realtime libs)	40	+AllTarget(sciplot realtime libs)
41		41
42	-NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))	42	NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
43	-NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))	43	NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES))
44	+NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES))
45	+NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIB),$(SYS_LIBRARIES))
46
47	doc: $(HOBJS) $(HDOC)
48	@echo "Updated html."
49	@@ -79,9 +83,16 @@	44	@@ -79,9 +83,16 @@
50	tar cfv $(TARFILE).tar $(TARFILES)	45	tar cfv $(TARFILE).tar $(TARFILES)
51	compress $(TARFILE).tar	46	compress $(TARFILE).tar
Lines 54-60 Link Here
54	+ $(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o	49	+ $(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o
55	+ $(RANLIB) $(LIBNAME).a	50	+ $(RANLIB) $(LIBNAME).a
56	+ $(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o \	51	+ $(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o \
57	+ $(LDFLAGS) $(MOTIFLIB) $(LDLIBS)	52	+ $(LDFLAGS) $(MOTIFLIBS) $(LDLIBS)
58	+	53	+
59	# Dependencies:	54	# Dependencies: