diff options
author | nectar <nectar@FreeBSD.org> | 2000-01-17 03:13:32 +0800 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2000-01-17 03:13:32 +0800 |
commit | bb29ff34a6ff9ba37ae626488c2d9f3478b94ebb (patch) | |
tree | 696ff855f99c40a630be33b9ca5052ece4e849ba /x11-toolkits/wxgtk-devel | |
parent | a068f8a173d371ba5a8b9f0167942432094bb085 (diff) | |
download | freebsd-ports-gnome-bb29ff34a6ff9ba37ae626488c2d9f3478b94ebb.tar.gz freebsd-ports-gnome-bb29ff34a6ff9ba37ae626488c2d9f3478b94ebb.tar.zst freebsd-ports-gnome-bb29ff34a6ff9ba37ae626488c2d9f3478b94ebb.zip |
Update 2.1.0b9 -> 2.1.11
Diffstat (limited to 'x11-toolkits/wxgtk-devel')
-rw-r--r-- | x11-toolkits/wxgtk-devel/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/wxgtk-devel/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/wxgtk-devel/files/patch-aa | 52 | ||||
-rw-r--r-- | x11-toolkits/wxgtk-devel/files/patch-ac | 41 | ||||
-rw-r--r-- | x11-toolkits/wxgtk-devel/pkg-plist | 33 |
5 files changed, 89 insertions, 43 deletions
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile index f8dc8df21d10..276e317604ba 100644 --- a/x11-toolkits/wxgtk-devel/Makefile +++ b/x11-toolkits/wxgtk-devel/Makefile @@ -6,8 +6,8 @@ # $FreeBSD$ # -DISTNAME= wxGTK-2.1.0-b9 -PKGNAME= wxgtk-2.1.0b9 +DISTNAME= wxGTK-2.1.11 +PKGNAME= wxgtk-2.1.11 CATEGORIES= x11-toolkits MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \ http://www.nectar.com/distfiles/ diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo index c85ac8eec3a1..14aaa4ac7666 100644 --- a/x11-toolkits/wxgtk-devel/distinfo +++ b/x11-toolkits/wxgtk-devel/distinfo @@ -1 +1 @@ -MD5 (wxGTK-2.1.0-b9.tgz) = 6fe66991925952f68bc8e5c3bc6a3ae5 +MD5 (wxGTK-2.1.11.tgz) = a897a00260879ef527dd77bdda0fc2c5 diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa index c2d2fde6c6e8..c176d82fe805 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-aa +++ b/x11-toolkits/wxgtk-devel/files/patch-aa @@ -1,34 +1,26 @@ ---- configure.orig Thu Aug 26 11:03:32 1999 -+++ configure Sun Sep 19 13:24:58 1999 -@@ -6730,7 +6730,7 @@ - fi +--- configure.in.orig Fri Jan 14 09:24:19 2000 ++++ configure.in Fri Jan 14 09:26:29 2000 +@@ -1701,12 +1701,10 @@ + WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" - TOOLKIT_INCLUDE="$GTK_CFLAGS" -- GUI_TK_LIBRARY="$GTK_LIBS -ldl" -+ GUI_TK_LIBRARY="$GTK_LIBS" - TOOLKIT=GTK - - GUIHEADERS=GTK_HEADERS -@@ -7834,11 +7834,8 @@ + dnl the name of the shared library +-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" ++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2" - WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a" - --WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -- --WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}" --WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so" --WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so" -+WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.so.1" -+WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}.so" + dnl the name of the links to the shared library +-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}" +-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so" +-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so" ++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so" + dnl shared library settings SHARED_LD= - PIC_FLAG= -@@ -12035,8 +12032,6 @@ - s%@WX_LIBRARY@%$WX_LIBRARY%g - s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g - s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g --s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g --s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g - s%@PROGRAM_EXT@%$PROGRAM_EXT%g - s%@WX_CREATE_LINKS@%$WX_CREATE_LINKS%g - s%@WX_CREATE_INSTALLED_LINKS@%$WX_CREATE_INSTALLED_LINKS%g +@@ -2964,8 +2962,6 @@ + AC_SUBST(WX_LIBRARY) + AC_SUBST(WX_TARGET_LIBRARY) + AC_SUBST(WX_LIBRARY_LINK1) +-AC_SUBST(WX_LIBRARY_LINK2) +-AC_SUBST(WX_LIBRARY_LINK3) + AC_SUBST(PROGRAM_EXT) + + dnl are we supposed to create the links? diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac new file mode 100644 index 000000000000..6af51255b4b9 --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-ac @@ -0,0 +1,41 @@ +--- Makefile.in.orig Fri Jan 14 09:27:03 2000 ++++ Makefile.in Fri Jan 14 09:27:48 2000 +@@ -2050,19 +2050,11 @@ + + CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ + @$(RM) ./lib/@WX_LIBRARY_LINK1@ +- @$(RM) ./lib/@WX_LIBRARY_LINK2@ +- @$(RM) ./lib/@WX_LIBRARY_LINK3@ + $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ +- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ +- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ + + CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ + $(RM) $(libdir)/@WX_LIBRARY_LINK1@ +- $(RM) $(libdir)/@WX_LIBRARY_LINK2@ +- $(RM) $(libdir)/@WX_LIBRARY_LINK3@ + $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@ +- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@ +- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@ + + $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h + +@@ -2115,9 +2107,7 @@ + $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm + + $(INSTALL) -d $(includedir)/wx +- $(INSTALL) -d $(includedir)/wx/msw + $(INSTALL) -d $(includedir)/wx/gtk +- $(INSTALL) -d $(includedir)/wx/motif + $(INSTALL) -d $(includedir)/wx/html + $(INSTALL) -d $(includedir)/wx/protocol + $(INSTALL) -d $(includedir)/wx/unix +@@ -2148,8 +2138,6 @@ + @echo " Removing library..." + @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ + @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ +- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ +- @$(RM) $(libdir)/@WX_LIBRARY_LINK3@ + @echo " Removing helper files..." + @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + @$(RM) $(bindir)/wx-config diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist index c6a515ac0953..b2538cbca939 100644 --- a/x11-toolkits/wxgtk-devel/pkg-plist +++ b/x11-toolkits/wxgtk-devel/pkg-plist @@ -21,6 +21,7 @@ include/wx/combobox.h include/wx/confbase.h include/wx/config.h include/wx/control.h +include/wx/ctrlsub.h include/wx/cursor.h include/wx/dataobj.h include/wx/date.h @@ -37,6 +38,7 @@ include/wx/dde.h include/wx/debug.h include/wx/defs.h include/wx/dialog.h +include/wx/dialup.h include/wx/dirdlg.h include/wx/dnd.h include/wx/docmdi.h @@ -54,6 +56,9 @@ include/wx/filefn.h include/wx/filesys.h include/wx/font.h include/wx/fontdlg.h +include/wx/fontenum.h +include/wx/fontmap.h +include/wx/fontutil.h include/wx/frame.h include/wx/fs_inet.h include/wx/fs_zip.h @@ -67,6 +72,7 @@ include/wx/generic/dcpsg.h include/wx/generic/dirdlgg.h include/wx/generic/filedlgg.h include/wx/generic/fontdlgg.h +include/wx/generic/grid.h include/wx/generic/gridg.h include/wx/generic/helpext.h include/wx/generic/helphtml.h @@ -105,7 +111,9 @@ include/wx/gtk/colour.h include/wx/gtk/combobox.h include/wx/gtk/control.h include/wx/gtk/cursor.h +include/wx/gtk/dataform.h include/wx/gtk/dataobj.h +include/wx/gtk/dataobj2.h include/wx/gtk/dc.h include/wx/gtk/dcclient.h include/wx/gtk/dcmemory.h @@ -135,6 +143,7 @@ include/wx/gtk/scrolbar.h include/wx/gtk/settings.h include/wx/gtk/slider.h include/wx/gtk/spinbutt.h +include/wx/gtk/spinctrl.h include/wx/gtk/statbmp.h include/wx/gtk/statbox.h include/wx/gtk/statline.h @@ -153,17 +162,19 @@ include/wx/helpbase.h include/wx/helphtml.h include/wx/helpwin.h include/wx/helpxlp.h -include/wx/html/forcelink.h +include/wx/html/forcelnk.h +include/wx/html/helpctrl.h +include/wx/html/helpdata.h +include/wx/html/helpfrm.h include/wx/html/htmlcell.h include/wx/html/htmldefs.h -include/wx/html/htmlfilter.h -include/wx/html/htmlhelp.h -include/wx/html/htmlparser.h +include/wx/html/htmlfilt.h +include/wx/html/htmlpars.h include/wx/html/htmltag.h include/wx/html/htmlwin.h -include/wx/html/htmlwinparser.h -include/wx/html/mod_templ.h -include/wx/html/version.h +include/wx/html/htmprint.h +include/wx/html/m_templ.h +include/wx/html/winpars.h include/wx/icon.h include/wx/image.h include/wx/imaglist.h @@ -229,6 +240,7 @@ include/wx/sizer.h include/wx/slider.h include/wx/socket.h include/wx/spinbutt.h +include/wx/spinctrl.h include/wx/splitter.h include/wx/statbmp.h include/wx/statbox.h @@ -259,6 +271,7 @@ include/wx/treectrl.h include/wx/txtstrm.h include/wx/types.h include/wx/unix/execute.h +include/wx/unix/fontutil.h include/wx/url.h include/wx/utils.h include/wx/valgen.h @@ -280,9 +293,9 @@ include/wx/wxprec.h include/wx/xpmhand.h include/wx/zipstrm.h include/wx/zstream.h -lib/wx/include/wx/gtk/setup.h lib/libwx_gtk.so -lib/libwx_gtk.so.1 +lib/libwx_gtk.so.2 +lib/wx/include/wx/gtk/setup.h share/wx/afm/Cour.afm share/wx/afm/CourBo.afm share/wx/afm/CourBoO.afm @@ -317,8 +330,8 @@ share/wx/gs_afm/TimesRo.afm @dirrm lib/wx/include/wx @dirrm lib/wx/include @dirrm lib/wx -@dirrm share/wx/afm @dirrm share/wx/gs_afm +@dirrm share/wx/afm @dirrm share/wx @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |