diff options
author | skrll <skrll@pkgsrc.org> | 2001-04-30 11:03:30 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2001-04-30 11:03:30 +0000 |
commit | 24af03f2995bb7d2602f9e989dfc502d8759d87c (patch) | |
tree | aeac6104b2f3cdf6769da9704d649625f273129e | |
parent | c3a5a5619bb402964c0abd690ccbc5082cf7d7ac (diff) | |
download | pkgsrc-24af03f2995bb7d2602f9e989dfc502d8759d87c.tar.gz |
Update to version 0.3.0 as the old one no longer exists.
- New homepage on sourceforge.
- Package is now called qwt not qwtlib - so conflict with qwtlib.
- New version requires QT2.
-rw-r--r-- | x11/qwt/Makefile | 29 | ||||
-rw-r--r-- | x11/qwt/distinfo | 7 | ||||
-rw-r--r-- | x11/qwt/patches/patch-aa | 83 | ||||
-rw-r--r-- | x11/qwt/pkg/PLIST | 58 |
4 files changed, 133 insertions, 44 deletions
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index 894694eb9cb..cd98b4f5c54 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,32 +1,33 @@ -# $NetBSD: Makefile,v 1.7 2001/03/05 12:47:12 skrll Exp $ +# $NetBSD: Makefile,v 1.8 2001/04/30 11:03:30 skrll Exp $ -DISTNAME= qwtlib-0.2 +DISTNAME= qwt-0.3.0 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.troll.no/contrib/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/} MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.troll.no/qtprogs.html +HOMEPAGE= http://sourceforge.net/projects/qwt COMMENT= Qt widget library for technical purposes -DEPENDS+= qt1-1.44:../../x11/qt1 +DEPENDS+= qt2-libs-2.3.0:../../x11/qt2-libs USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes -WRKSRC= ${WRKDIR}/qwt -ALL_TARGET= src -MAKE_ENV+= CXX=${CXX} +EVAL_PREFIX+= QT2DIR=qt2-libs +MAKE_ENV+= CXX="${CXX}" \ + QTDIR="${QT2DIR}/qt2" -do-configure: - ${CP} ${FILESDIR}/Makefile.* ${WRKSRC} +CONFLICTS= qwtlib-* + +post-patch: + ${LN} -s ${WRKSRC}/makefiles/netbsd-g++ ${WRKSRC}/Makefile do-install: - @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqwt.la \ + @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libqwt.la \ ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/include/qwt - ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/qwt - ${INSTALL_DATA} ${WRKSRC}/doc/man/* ${PREFIX}/man/man3 + ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt + ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 8a8e1a304ef..3dd47f2385d 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:43 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/04/30 11:03:30 skrll Exp $ -SHA1 (qwtlib-0.2.tgz) = 29aa2873c25c0c714d87fa798c0c44b65af842eb -Size (qwtlib-0.2.tgz) = 485222 bytes +SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b +Size (qwt-0.3.0.tar.gz) = 484675 bytes +SHA1 (patch-aa) = 5c55cc77207e6fba850c8534cae4db2384c31bbb diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa new file mode 100644 index 00000000000..c047a083141 --- /dev/null +++ b/x11/qwt/patches/patch-aa @@ -0,0 +1,83 @@ +$NetBSD: patch-aa,v 1.1 2001/04/30 11:03:31 skrll Exp $ + +--- makefiles/netbsd-g++.orig Wed Dec 13 23:23:09 2000 ++++ makefiles/netbsd-g++ +@@ -7,14 +7,14 @@ + + ####### Compiler, tools and options + +-CC = gcc +-CXX = g++ +-CFLAGS = -O2 -fPIC -DNO_DEBUG +-CXXFLAGS= -O2 -fPIC -DNO_DEBUG ++#CC = gcc ++#CXX = g++ ++#CFLAGS = -O2 -fPIC -DNO_DEBUG ++#CXXFLAGS= -O2 -fPIC -DNO_DEBUG + INCPATH = -I$(QTDIR)/include +-LINK = g++ +-LFLAGS = -Bshareable +-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm ++#LINK = g++ ++#LFLAGS = -Bshareable ++LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm -Wl,-R${X11BASE}/lib + AR = ar cqs + RANLIB = + MOC = $(QTDIR)/bin/moc +@@ -135,6 +135,7 @@ + include/moc_qwt_sldbase.o \ + include/moc_qwt_thermo.o + DIST = ++TARGETLA= libqwt.la + TARGET = libqwt.so.0.3.0 + TARGETA = libqwt.a + TARGETD = libqwt.so.0.3.0 +@@ -147,37 +148,34 @@ + .SUFFIXES: .cpp .cxx .cc .C .c + + .cpp.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< ++ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + + .cxx.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< ++ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + + .cc.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< ++ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + + .C.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< ++ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + + .c.o: +- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + + ####### Build rules + + + all: $(TARGET) + +-$(TARGET): $(OBJECTS) $(OBJMOC) $(SUBLIBS) +- -rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) +- $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS) +- -ln -s $(TARGET) $(TARGET0) +- -ln -s $(TARGET) $(TARGET1) +- -ln -s $(TARGET) $(TARGET2) ++$(TARGETLA): $(OBJECTS) $(OBJMOC) $(SUBLIBS) ++ $(LIBTOOL) --mode=link $(CXX) -o $(TARGETLA) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) \ ++ -version-info 0:3:0 -rpath $(X11BASE)/lib ++ ++$(TARGET): $(TARGETLA) + + staticlib: $(TARGETA) + +-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) +- -rm -f $(TARGETA) +- $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC) ++$(TARGETA): $(TARGETLA) + + moc: $(SRCMOC) + diff --git a/x11/qwt/pkg/PLIST b/x11/qwt/pkg/PLIST index 1b7befae0bd..ec7c48c712f 100644 --- a/x11/qwt/pkg/PLIST +++ b/x11/qwt/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:11:03 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/04/30 11:03:31 skrll Exp $ include/qwt/qwt.h include/qwt/qwt_arrbtn.h include/qwt/qwt_autoscl.h @@ -33,30 +33,34 @@ lib/libqwt.a lib/libqwt.la lib/libqwt.so lib/libqwt.so.0 -lib/libqwt.so.0.2 -man/man3/Qwt.3 -man/man3/QwtArrowButton.3 -man/man3/QwtAutoScale.3 -man/man3/QwtColorFilter.3 -man/man3/QwtCounter.3 -man/man3/QwtCurve.3 -man/man3/QwtDblRange.3 -man/man3/QwtDiMap.3 -man/man3/QwtGrid.3 -man/man3/QwtKnob.3 -man/man3/QwtLegend.3 -man/man3/QwtMarker.3 -man/man3/QwtMath.3 -man/man3/QwtPixFrame.3 -man/man3/QwtPlot.3 -man/man3/QwtScale.3 -man/man3/QwtScaleDiv.3 -man/man3/QwtScaleDraw.3 -man/man3/QwtScaleIf.3 -man/man3/QwtSlider.3 -man/man3/QwtSliderBase.3 -man/man3/QwtSpline.3 -man/man3/QwtSymbol.3 -man/man3/QwtThermo.3 -man/man3/QwtWheel.3 +lib/libqwt.so.0.3 +man/man3/qwt.3 +man/man3/qwt_math_h.3 +man/man3/qwtarrowbutton.3 +man/man3/qwtautoscale.3 +man/man3/qwtcolorfilter.3 +man/man3/qwtcounter.3 +man/man3/qwtcurve.3 +man/man3/qwtdblrange.3 +man/man3/qwtdimap.3 +man/man3/qwtfltrdim.3 +man/man3/qwtfltrgray.3 +man/man3/qwtfltrinv.3 +man/man3/qwtgrid.3 +man/man3/qwtknob.3 +man/man3/qwtlegend.3 +man/man3/qwtlegenditem.3 +man/man3/qwtmarker.3 +man/man3/qwtpixframe.3 +man/man3/qwtplot.3 +man/man3/qwtscale.3 +man/man3/qwtscalediv.3 +man/man3/qwtscaledraw.3 +man/man3/qwtscaleif.3 +man/man3/qwtslider.3 +man/man3/qwtsliderbase.3 +man/man3/qwtspline.3 +man/man3/qwtsymbol.3 +man/man3/qwtthermo.3 +man/man3/qwtwheel.3 @dirrm include/qwt |