ports/81864: Update port: x11-toolkits/vdk to 2.4.1
KATO Tsuguru
tkato432 at yahoo.com
Fri Jun 3 15:10:13 UTC 2005
>Number: 81864
>Category: ports
>Synopsis: Update port: x11-toolkits/vdk to 2.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 03 15:10:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 2.4.1
Remove file:
files/patch-vdk-config-2.in
files/patch-vdk::chart.cc
files/patch-vdk::vdkbtrees.h
files/patch-vdk::vdkheap.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-toolkits/vdk/Makefile x11-toolkits/vdk/Makefile
--- /usr/ports/x11-toolkits/vdk/Makefile Sat Mar 12 20:33:04 2005
+++ x11-toolkits/vdk/Makefile Thu Jun 2 18:29:09 2005
@@ -6,8 +6,7 @@
#
PORTNAME= vdk
-PORTVERSION= 2.4.0
-PORTREVISION= 2
+PORTVERSION= 2.4.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= vdklib
@@ -16,19 +15,24 @@
COMMENT= C++ wrapper for GTK+ toolkit
USE_X_PREFIX= yes
-USE_GNOME= gnometarget gtk20 lthack
+USE_GNOME= gnomehack gnometarget gtk20
USE_REINPLACE= yes
-USE_INC_LIBTOOL_VER= 13
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
+USE_LIBTOOL_VER= 15
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
INSTALLS_SHLIB= yes
MAN1= vdk-config-2.1
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
+
post-patch:
- @${REINPLACE_CMD} -e 's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g ; \
- s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g' ${WRKSRC}/configure
+.for file in vdk-config-2.in vdk-2.x.pc.in
+ @${REINPLACE_CMD} -e 's|-lpthread|${LDFLAGS}|g' ${WRKSRC}/${file}
+.endfor
.for file in vdk/FileDialog.h vdk/gtksourcebuffer.h vdk/gtksourcetag.h
@${REINPLACE_CMD} -e 's|<regex\.h>|<gnuregex.h>|g' ${WRKSRC}/${file}
.endfor
diff -urN /usr/ports/x11-toolkits/vdk/distinfo x11-toolkits/vdk/distinfo
--- /usr/ports/x11-toolkits/vdk/distinfo Sat Jul 10 19:56:17 2004
+++ x11-toolkits/vdk/distinfo Thu Jun 2 13:17:34 2005
@@ -1,2 +1,2 @@
-MD5 (vdk-2.4.0.tar.gz) = b23dcfa237dbf4b9424bcaa37683a7ba
-SIZE (vdk-2.4.0.tar.gz) = 1071732
+MD5 (vdk-2.4.1.tar.gz) = f388bf265a476880e98ddec7ac4e63f7
+SIZE (vdk-2.4.1.tar.gz) = 1062475
diff -urN /usr/ports/x11-toolkits/vdk/files/patch-vdk-config-2.in x11-toolkits/vdk/files/patch-vdk-config-2.in
--- /usr/ports/x11-toolkits/vdk/files/patch-vdk-config-2.in Thu Nov 20 01:12:16 2003
+++ x11-toolkits/vdk/files/patch-vdk-config-2.in Thu Jan 1 09:00:00 1970
@@ -1,14 +0,0 @@
---- vdk-config-2.in.orig Wed Nov 22 14:06:52 2000
-+++ vdk-config-2.in Tue Nov 18 12:03:59 2003
-@@ -16,9 +16,9 @@
- LIBDIRS="-L at libdir@"
-
- vdk_libs="$LIBDIRS -lvdk @GNOME_VDK@ @GTK_LIBS@\
-- @SIGC_LIBS@ @GNOME_LIBS@"
-+ @SIGC_LIBS@ @GNOME_LIBS@ @LDFLAGS@"
- vdk_cflags="$CFLAGS @GTK_CFLAGS@ @SIGC_CFLAGS@\
-- @GNOME_CFLAGS@ @SIGCDEFINE@ @GNOMEDEFINE@"
-+ @GNOME_CFLAGS@ @SIGCDEFINE@ @GNOMEDEFINE@ @CPPFLAGS@"
-
- usage()
- {
diff -urN /usr/ports/x11-toolkits/vdk/files/patch-vdk::Makefile.in x11-toolkits/vdk/files/patch-vdk::Makefile.in
--- /usr/ports/x11-toolkits/vdk/files/patch-vdk::Makefile.in Sat Jul 10 19:56:17 2004
+++ x11-toolkits/vdk/files/patch-vdk::Makefile.in Thu Jun 2 13:58:29 2005
@@ -1,27 +1,35 @@
---- vdk/Makefile.in.orig Tue May 18 15:55:11 2004
-+++ vdk/Makefile.in Fri Jul 9 02:31:31 2004
-@@ -197,7 +197,6 @@
- # vdktextview.h
- # vdkpacker.h
+--- vdk/Makefile.in.orig Wed May 25 00:05:27 2005
++++ vdk/Makefile.in Thu Jun 2 13:58:14 2005
+@@ -59,7 +59,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libvdk_la_LIBADD =
+-am_libvdk_la_OBJECTS = regex.lo gtksourcebuffer.lo gtktextsearch.lo \
++am_libvdk_la_OBJECTS = gtksourcebuffer.lo gtktextsearch.lo \
+ gtksourcetag.lo gtksourceview.lo gtkundomanager.lo \
+ gtksourceview-marshal.lo gtktextregion.lo vdkeditor.lo \
+ gtkdatabox.lo gtkdataboxmarshal.lo abstract_button.lo \
+@@ -231,7 +231,6 @@
+ lib_LTLIBRARIES = libvdk.la
+ vdkincludedir = $(includedir)/vdk2/vdk
vdkinclude_HEADERS = \
- regex.h\
gtksourcebuffer.h\
gtktextsearch.h \
gtksourcetag.h\
-@@ -333,7 +332,6 @@
- # vdkregex.cc
- # vdkpacker.cc
+@@ -330,7 +329,6 @@
+ vdkdockable.h
+
libvdk_la_SOURCES = \
- regex.c\
gtksourcebuffer.c\
gtktextsearch.c \
gtksourcetag.c\
-@@ -440,7 +438,7 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
-
- libvdk_la_LIBADD =
--am_libvdk_la_OBJECTS = regex.lo gtksourcebuffer.lo gtktextsearch.lo \
-+am_libvdk_la_OBJECTS = gtksourcebuffer.lo gtktextsearch.lo \
- gtksourcetag.lo gtksourceview.lo gtkundomanager.lo \
- gtksourceview-marshal.lo gtktextregion.lo vdkeditor.lo \
- gtkdatabox.lo gtkdataboxmarshal.lo abstract_button.lo \
+@@ -528,7 +526,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rawobj.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rawpixbuf.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rawpixmap.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regex.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scrolled.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/separator.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/slider.Plo at am__quote@
diff -urN /usr/ports/x11-toolkits/vdk/files/patch-vdk::chart.cc x11-toolkits/vdk/files/patch-vdk::chart.cc
--- /usr/ports/x11-toolkits/vdk/files/patch-vdk::chart.cc Fri Sep 24 10:04:01 2004
+++ x11-toolkits/vdk/files/patch-vdk::chart.cc Thu Jan 1 09:00:00 1970
@@ -1,45 +0,0 @@
---- vdk/chart.cc.orig Wed May 22 17:26:12 2002
-+++ vdk/chart.cc Thu Aug 5 19:16:35 2004
-@@ -45,7 +45,10 @@
- size = Usize;
- printf("\nsize:%d,%d",size.x,size.y);
- fflush(stdout);
-- axis = ChartAxis(this,size.X(),size.Y());
-+ // patch Bug#262091
-+ // axis = ChartAxis(this,size.X(),size.Y());
-+ ChartAxis axis_tmp( this, size.X(), size.Y() );
-+ axis = axis_tmp;
- axis.Draw();
- DrawTitle();
- DrawChart();
-@@ -115,7 +118,10 @@
- void VDKChart::SetChartBorder(int b)
- {
- size = Usize;
--axis = ChartAxis(this,size.X(),size.Y());
-+// patch Bug#262091
-+// axis = ChartAxis(this,size.X(),size.Y());
-+ChartAxis axis_tmp(this,size.X(),size.Y());
-+axis = axis_tmp;
- DrawChart();
- }
- /*
-@@ -415,10 +421,18 @@
- ChartAxis::ChartAxis(VDKChart* owner,int w, int h):
- owner(owner)
- {
-+// patch Bug#262091
-+/*
- domain = VDKRect(owner->ChartBorder,
- h-owner->ChartBorder,
- w-owner->ChartBorder*2,
- h-owner->ChartBorder*2);
-+*/
-+VDKRect r(owner->ChartBorder,
-+ h-owner->ChartBorder,
-+ w-owner->ChartBorder*2,
-+ h-owner->ChartBorder*2);
-+domain = r;
- }
- /*
- copy-initializer
diff -urN /usr/ports/x11-toolkits/vdk/files/patch-vdk::vdkbtrees.h x11-toolkits/vdk/files/patch-vdk::vdkbtrees.h
--- /usr/ports/x11-toolkits/vdk/files/patch-vdk::vdkbtrees.h Fri Sep 24 10:04:01 2004
+++ x11-toolkits/vdk/files/patch-vdk::vdkbtrees.h Thu Jan 1 09:00:00 1970
@@ -1,62 +0,0 @@
---- vdk/vdkbtrees.h.orig Wed Nov 22 14:10:33 2000
-+++ vdk/vdkbtrees.h Thu Aug 5 19:16:36 2004
-@@ -717,7 +717,7 @@
- class AbstractRedBlackTree : public AbstractBinaryTree<T, Node> {
- protected:
- virtual Node *FindNode(T q)
-- { return (root) ? (Node *) root->find(q) : NULL; }
-+ { return (this->root) ? (Node *) this->root->find(q) : NULL; }
- };
-
- /*!
-@@ -985,14 +985,14 @@
- BlackHeight = -1;
-
- // Check binary tree properties.
-- if (parent != _parent)
-+ if (this->parent != _parent)
- return NULL;
-- if (left) {
-- if (object < left->object)
-+ if (this->left) {
-+ if (this->object < this->left->object)
- return NULL;
- }
-- if (right) {
-- if (right->object < object)
-+ if (this->right) {
-+ if (this->right->object < this->object)
- return NULL;
- }
-
-@@ -1001,15 +1001,15 @@
- // If a node is red, then both its children are black
- // (NULL nodes are black).
- if (clr == Red) {
-- if ((left && left->clr != Black) ||
-- (right && right->clr != Black))
-+ if ((this->left && this->left->clr != Black) ||
-+ (this->right && this->right->clr != Black))
- return NULL;
- }
-
- // The black-heights of all leaf nodes are equal.
- int bh = NULL;
-
-- if ((! left) && (! right)) {
-+ if ((! this->left) && (! this->right)) {
- // Compute black-height of node
- for (Node *sc = (Node *) this; sc; sc = sc->parent)
- if (sc->clr == Black)
-@@ -1023,9 +1023,9 @@
- return NULL;
- }
- }
-- if (left && (! left->CheckTreeProperties((Node *) this)))
-+ if (this->left && (! this->left->CheckTreeProperties((Node *) this)))
- return NULL;
-- if (right && (! right->CheckTreeProperties((Node *) this)))
-+ if (this->right && (! this->right->CheckTreeProperties((Node *) this)))
- return NULL;
- return 1;
- }
diff -urN /usr/ports/x11-toolkits/vdk/files/patch-vdk::vdkheap.h x11-toolkits/vdk/files/patch-vdk::vdkheap.h
--- /usr/ports/x11-toolkits/vdk/files/patch-vdk::vdkheap.h Fri Sep 24 10:04:01 2004
+++ x11-toolkits/vdk/files/patch-vdk::vdkheap.h Thu Jan 1 09:00:00 1970
@@ -1,58 +0,0 @@
---- vdk/vdkheap.h.orig Wed Nov 22 14:10:52 2000
-+++ vdk/vdkheap.h Thu Aug 5 19:16:36 2004
-@@ -85,7 +85,7 @@
- VDKHeap<T>::VDKHeap(T* source, int size): VDKContainer<T>(size)
- {
- for(int i = 0; i < size; i++)
-- data[i] = source[i];
-+ this->data[i] = source[i];
- BuildHeap();
- }
-
-@@ -94,13 +94,13 @@
- void VDKHeap<T>::Heapify(int i, int heapsize)
- {
- int l = left(i), r = right(i), largest = i;
-- if( (l < heapsize) && (data[l] > data[i])) largest = l;
-- if( (r < heapsize) && (data[r] > data[largest])) largest = r;
-+ if( (l < heapsize) && (this->data[l] > this->data[i])) largest = l;
-+ if( (r < heapsize) && (this->data[r] > this->data[largest])) largest = r;
- if(largest != i)
- {
-- T temp = data[i];
-- data[i] = data[largest];
-- data[largest] = temp;
-+ T temp = this->data[i];
-+ this->data[i] = this->data[largest];
-+ this->data[largest] = temp;
- Heapify(largest,heapsize);
- }
- }
-@@ -109,21 +109,21 @@
- template <class T>
- void VDKHeap<T>::BuildHeap(void)
- {
-- for (int i = (size()-1)/2 ; i >= 0; i--)
-- Heapify(i,size());
-+ for (int i = (this->size()-1)/2 ; i >= 0; i--)
-+ Heapify(i,this->size());
- }
-
- // HEAPSORT
- template <class T>
- void VDKHeap<T>::Sort(void)
- {
-- int heapsize = size();
-+ int heapsize = this->size();
- int i = heapsize-1;
- for(; i > 0; i--)
- {
-- T temp = data[0];
-- data[0] = data[i];
-- data[i] = temp;
-+ T temp = this->data[0];
-+ this->data[0] = this->data[i];
-+ this->data[i] = temp;
- heapsize--;
- Heapify(0,heapsize);
- }
diff -urN /usr/ports/x11-toolkits/vdk/pkg-plist x11-toolkits/vdk/pkg-plist
--- /usr/ports/x11-toolkits/vdk/pkg-plist Sat Jul 10 19:56:17 2004
+++ x11-toolkits/vdk/pkg-plist Thu Jun 2 14:22:57 2005
@@ -82,11 +82,6 @@
include/vdk2/vdk/vdkfilechooser.h
include/vdk2/vdk/vdkfileicondlg.h
include/vdk2/vdk/vdkfont.h
-include/vdk2/vdk/vdkgnomeapp.h
-include/vdk2/vdk/vdkgnomeappbar.h
-include/vdk2/vdk/vdkgnomededit.h
-include/vdk2/vdk/vdkgnomeentry.h
-include/vdk2/vdk/vdkgnomeform.h
include/vdk2/vdk/vdkheap.h
include/vdk2/vdk/vdkhlbutton.h
include/vdk2/vdk/vdkhlbuttonbar.h
@@ -103,6 +98,7 @@
lib/libvdk.a
lib/libvdk.so
lib/libvdk.so.6
+libdata/pkgconfig/vdk-2.x.pc
share/aclocal/vdk-2.m4
@dirrm include/vdk2/vdk
@dirrm include/vdk2
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list