summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/wxGTK/patches/patch-ab176
-rw-r--r--x11/wxGTK/patches/patch-ac110
-rw-r--r--x11/wxGTK/pkg/PLIST13
3 files changed, 249 insertions, 50 deletions
diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
index dc0589441da..d689a516dec 100644
--- a/x11/wxGTK/patches/patch-ab
+++ b/x11/wxGTK/patches/patch-ab
@@ -1,7 +1,23 @@
---- Makefile.in.orig Sun Jul 9 05:04:14 2000
-+++ Makefile.in Thu Jul 27 21:55:59 2000
-@@ -37,16 +37,12 @@
- VP4 = @top_srcdir@/src/generic
+$NetBSD: patch-ab,v 1.3 2000/09/01 02:45:57 dmcmahill Exp $
+
+--- Makefile.in.orig Sun Aug 20 04:52:53 2000
++++ Makefile.in Thu Aug 31 20:41:33 2000
+@@ -20,11 +20,11 @@
+
+ .c.o :
+- $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
++ ${LIBTOOL} --mode=compile $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) -o $@ $<
+
+ .cpp.o :
+- $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
++ ${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
+
+ .cxx.o :
+- $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
++ ${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
+
+ ########################### Paths #################################
+@@ -38,8 +38,4 @@
VP5 = @top_srcdir@/src/unix
VP6 = @top_srcdir@/src/html
-VP7 = @top_srcdir@/src/png
@@ -10,16 +26,14 @@
-VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc
- # the comment at the end of the next line is needed because otherwise autoconf
+@@ -47,5 +43,5 @@
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP11) # ':' for autoconf
top_srcdir = @top_srcdir@
- prefix = @prefix@
-@@ -75,6 +71,8 @@
-
+@@ -76,11 +72,14 @@
top_builddir = .
+EXTRALIBS=-lz -L@prefix@/lib -R@prefix@/lib -ljpeg -lpng -ltiff
@@ -27,8 +41,16 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-@@ -110,10 +108,6 @@
- COMMDIR = $(WXDIR)/src/common
++INSTALL_DATA_DIR = ${BSD_INSTALL_DATA_DIR}
+ # my autoconf doesn't set this
+-#INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ # maybe do an additional chmod if needed?
+-INSTALL_SCRIPT = @INSTALL@
++#INSTALL_SCRIPT = @INSTALL@
+ transform = @program_transform_name@
+
+@@ -111,8 +110,4 @@
HTMLDIR = $(WXDIR)/src/html
UNIXDIR = $(WXDIR)/src/unix
-PNGDIR = $(WXDIR)/src/png
@@ -37,9 +59,7 @@
-ZLIBDIR = $(WXDIR)/src/zlib
GTKDIR = $(WXDIR)/src/gtk
MOTIFDIR = $(WXDIR)/src/motif
- MSWDIR = $(WXDIR)/src/msw
-@@ -153,125 +147,6 @@
- OBJECTS = @ALL_OBJECTS@
+@@ -161,123 +156,4 @@
DEPFILES = @ALL_DEPFILES@
-# the object files of sublibraries (we assume that they don't change [often],
@@ -163,29 +183,136 @@
-
IODBCOBJS = \
catalog.o \
- connect.o \
-@@ -515,11 +390,6 @@
- cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
- cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+@@ -304,8 +180,11 @@
+ all: @WX_ALL@
+
+-@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
++CREATE_LINKS: $(top_builddir)/lib/@WX_LIBRARY_NAME@
++
++CREATE_INSTALLED_LINKS: preinstall
++
++$(top_builddir)/lib/@WX_LIBRARY_NAME@: $(OBJECTS)
+ @$(INSTALL) -d ./lib
+- $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
+- $(RANLIB) ./lib/$@
++ ${LIBTOOL} --mode=link cc -o $(top_builddir)/lib/@WX_LIBRARY_NAME@ ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1
+
+ @WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
+@@ -314,52 +193,12 @@
+ $(RANLIB) ./lib/$@
+
+-@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
+- @$(INSTALL) -d ./lib
+- $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
+-
+ @WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o
+ @$(INSTALL) -d ./lib
+ $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+
+-CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+- @$(RM) ./lib/@WX_LIBRARY_LINK1@
+- @$(RM) ./lib/@WX_LIBRARY_LINK2@
+- @$(RM) ./lib/@WX_LIBRARY_LINK3@
+- cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+-
+-CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+- cd lib \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
+-
+-CREATE_INSTALLED_LINKS: preinstall
+- $(RM) $(libdir)/@WX_LIBRARY_LINK1@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK2@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK3@
+- cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
+-
+-CREATE_INSTALLED_LINKS_GL: preinstall_gl
+- $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+- cd $(libdir) \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
+-
+ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
+
+ parser.o: parser.c lexer.c
+- $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
++ ${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS) -o $@ parser.c
+
+ parser.c: $(COMMDIR)/parser.y lexer.c
+@@ -393,24 +232,22 @@
+ # this is the real install target: copies the library, wx-config and the
+ # headers to the installation directory
+-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
++preinstall: $(top_builddir)/lib/@WX_LIBRARY_NAME@ $(top_builddir)/wx@TOOLKIT_NAME@-config
+ @echo " "
+ @echo " Installing wxWindows..."
+ @echo " "
+
+- $(INSTALL) -d $(prefix)
+- $(INSTALL) -d $(bindir)
+- $(INSTALL) -d $(libdir)
+
+ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
+- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
++ ${LIBTOOL} --mode=install ${INSTALL_DATA} $(top_builddir)/lib/@WX_LIBRARY_NAME@ ${libdir}
++
+
+- $(INSTALL) -d $(libdir)/wx
+- $(INSTALL) -d $(libdir)/wx/include
+- $(INSTALL) -d $(libdir)/wx/include/wx
+- $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
++ $(INSTALL_DATA_DIR) $(libdir)/wx
++ $(INSTALL_DATA_DIR) $(libdir)/wx/include
++ $(INSTALL_DATA_DIR) $(libdir)/wx/include/wx
++ $(INSTALL_DATA_DIR) $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+ $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+
+- $(INSTALL) -d $(includedir)/wx
++ $(INSTALL_DATA_DIR) $(includedir)/wx
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+@@ -423,8 +260,8 @@
+ done
+
+- $(INSTALL) -d $(localedir)
++ $(INSTALL_DATA_DIR) $(localedir)
+ @for p in $(WX_LINGUAS); do \
+- $(INSTALL) -d $(localedir)/$$p; \
+- $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
++ $(INSTALL_DATA_DIR) $(localedir)/$$p; \
++ $(INSTALL_DATA_DIR) $(localedir)/$$p/LC_MESSAGES; \
+ $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+ echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
+@@ -524,8 +361,4 @@
mkdir $(DISTDIR)/src
-- mkdir $(DISTDIR)/src/zlib
+ mkdir $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
# this target is the common part of distribution script for all GUI toolkits,
- # but is not used when building wxBase distribution
-@@ -550,7 +420,6 @@
- mkdir $(DISTDIR)/src/html/bitmaps
+@@ -561,5 +394,4 @@
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
mkdir $(DISTDIR)/src/png
- mkdir $(DISTDIR)/src/jpeg
mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/iodbc
- mkdir $(DISTDIR)/src/unix
-@@ -573,9 +442,6 @@
- cp $(PNGDIR)/*.h $(DISTDIR)/src/png
+@@ -584,7 +416,4 @@
cp $(PNGDIR)/*.c $(DISTDIR)/src/png
cp $(PNGDIR)/README $(DISTDIR)/src/png
- cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
@@ -193,4 +320,3 @@
- cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
- cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
diff --git a/x11/wxGTK/patches/patch-ac b/x11/wxGTK/patches/patch-ac
index 120208630b4..cd4b1dd8905 100644
--- a/x11/wxGTK/patches/patch-ac
+++ b/x11/wxGTK/patches/patch-ac
@@ -1,23 +1,87 @@
---- configure.orig Thu Jul 27 21:25:46 2000
-+++ configure Thu Jul 27 21:26:53 2000
-@@ -8706,14 +8706,14 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
-
--WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-
--WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so.${WX_CURRENT}.${WX_REVISION}"
-+WX_LIBRARY_LINK2="lib${WX_LIBRARY}.so.${WX_CURRENT}"
- WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
--WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so.${WX_CURRENT}.${WX_REVISION}"
-+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl.so.${WX_CURRENT}"
- WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
-
- SHARED_LD=
+$NetBSD: patch-ac,v 1.3 2000/09/01 02:45:57 dmcmahill Exp $
+
+--- src/makelib.env.in.orig Sun Aug 20 04:52:57 2000
++++ src/makelib.env.in Thu Aug 31 14:03:25 2000
+@@ -34,23 +34,21 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_DATA = @INSTALL_DATA_DIR@
+
+-TARGETLIB_STATIC = $(TARGET_LIBNAME).a
+-TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
+-TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
+-TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
++#TARGETLIB_STATIC = $(TARGET_LIBNAME).a
++#TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
+
+-TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
+
+ # Clears all default suffixes
+-.SUFFIXES: .o .cpp .c .cxx
++.SUFFIXES: .o .cpp .c .cxx
+
+-.c.o :
+- $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
++.c.o :
++ ${LIBTOOL} --mode=compile $(CCC) -c $(CFLAGS) -o $@ $<
+
+-.cpp.o :
+- $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
++.cpp.o :
++ ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) -o $@ $<
+
+-.cxx.o :
+- $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
++.cxx.o :
++ ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) -o $@ $<
+
+ # the comment at the end of the next line is needed because otherwise autoconf
+@@ -62,40 +60,19 @@
+
+
+-all: libtype_@WX_TARGET_LIBRARY_TYPE@
++all: $(TARGET_LIBNAME).la
+
+-libtype_so: CREATE_LINKS
+
+-libtype_a: $(TARGETLIB_STATIC)
+-
+-
+-$(TARGETLIB_SHARED): $(OBJECTS)
+- @$(INSTALL) -d $(top_builddir)/lib
+- $(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
+-
+-CREATE_LINKS: $(TARGETLIB_SHARED)
+- cd $(top_builddir)/lib \
+- && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
+- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
+-
+-$(TARGETLIB_STATIC): $(OBJECTS)
++$(TARGET_LIBNAME).la: $(OBJECTS)
+ @$(INSTALL) -d $(top_builddir)/lib
+- ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
+- $(RANLIB) $(top_builddir)/lib/$@
+-
+-install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
++ ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJECTS:.o=.lo} \
++ -rpath ${PREFIX}/lib -version-info major:minor \
+
+-install_so:
+- $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
+- @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
+- cd $(libdir) \
+- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
++install: install_lib install_headers
+
+-install_a:
+- $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
++install_lib:
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TARGET_LIBNAME}.la ${PREFIX}/lib
+
+ install_headers:
+- $(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
++ $(INSTALL_DATA_DIR) $(includedir)/wx/$(HEADER_SUBDIR)
+ @for h in $(HEADERS); do \
+ $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
diff --git a/x11/wxGTK/pkg/PLIST b/x11/wxGTK/pkg/PLIST
index f4caa946cc0..d4a7685b507 100644
--- a/x11/wxGTK/pkg/PLIST
+++ b/x11/wxGTK/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/31 22:56:38 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/09/01 02:45:57 dmcmahill Exp $
bin/wxgtk-config
bin/wx-config
include/wx/gtk/accel.h
@@ -321,8 +321,17 @@ include/wx/wxprec.h
include/wx/xpmhand.h
include/wx/zipstrm.h
include/wx/zstream.h
-lib/libwx_gtk.so.0.0.0
+lib/libwx_gtk.a
+lib/libwx_gtk.la
+lib/libwx_gtk.so.0.1
lib/wx/include/wx/gtk/setup.h
+share/locale/da/LC_MESSAGES/wxstd.mo
+share/locale/de/LC_MESSAGES/wxstd.mo
+share/locale/fr/LC_MESSAGES/wxstd.mo
+share/locale/ru/LC_MESSAGES/wxstd.mo
+share/locale/fi/LC_MESSAGES/wxstd.mo
+share/locale/cs/LC_MESSAGES/wxstd.mo
+share/locale/it/LC_MESSAGES/wxstd.mo
share/wx/afm/Cour.afm
share/wx/afm/CourBo.afm
share/wx/afm/CourBoO.afm
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 16:19:53 +0000