cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename patches; sync with libtool

Browse Source
This commit is contained in:
danh 2001-02-20 17:26:49 +00:00
parent d2b8648236
commit 662369bd34
9 changed files with 81 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gtk+/patches/patch-ae → x11/gtk+/patches/patch-configure
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2001/02/20 17:26:50 danh Exp $
--- configure.orig Wed May 24 20:31:48 2000
+++ configure Sun Aug 27 00:25:22 2000
@@ -3726,7 +3726,7 @@
+++ configure Tue Feb 20 12:21:35 2001
@@ -3726,7 +3726,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo

9
x11/gtk+/patches/patch-ac → x11/gtk+/patches/patch-docs_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-docs_Makefile_in,v 1.1 2001/02/20 17:26:50 danh Exp $
--- docs/Makefile.in.orig Wed May 24 21:12:15 2000
+++ docs/Makefile.in Wed Jun 21 06:04:39 2000
@@ -98,7 +98,7 @@
+++ docs/Makefile.in Tue Feb 20 12:21:33 2001
@@ -98,7 +98,7 @@ LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
@ -9,7 +10,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
@@ -185,46 +185,40 @@
@@ -185,46 +185,40 @@ gtk.dvi: gtk.texi
DVIPS = dvips
.texi.info:
@ -68,7 +69,7 @@
.dvi.ps:
$(DVIPS) $< -o $@
@@ -233,11 +227,10 @@
@@ -233,11 +227,10 @@ install-info-am: $(INFO_DEPS)
$(mkinstalldirs) $(DESTDIR)$(infodir)
@list='$(INFO_DEPS)'; \
for file in $$list; do \

5
x11/gtk+/patches/patch-ab → x11/gtk+/patches/patch-gdk_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-gdk_Makefile_in,v 1.1 2001/02/20 17:26:51 danh Exp $
--- gdk/Makefile.in.orig Wed May 24 21:11:03 2000
+++ gdk/Makefile.in Wed Jun 21 06:04:18 2000
@@ -135,7 +135,7 @@
+++ gdk/Makefile.in Tue Feb 20 12:21:33 2001
@@ -135,7 +135,7 @@ lib_LTLIBRARIES = libgdk.la
# libtool stuff: set version and export symbols for resolving
libgdkincludedir = $(includedir)/gdk

5
x11/gtk+/patches/patch-ag → x11/gtk+/patches/patch-gdk_gdkimage_c
View File

@ -1,5 +1,6 @@
--- gdk/gdkimage.c.orig Thu Apr 22 17:58:13 1999
+++ gdk/gdkimage.c Thu Apr 22 17:58:52 1999
$OpenBSD: patch-gdk_gdkimage_c,v 1.1 2001/02/20 17:26:51 danh Exp $
--- gdk/gdkimage.c.orig Thu Sep 23 15:43:39 1999
+++ gdk/gdkimage.c Tue Feb 20 12:21:36 2001
@@ -26,12 +26,14 @@
#include <config.h>

11
x11/gtk+/patches/patch-aa → x11/gtk+/patches/patch-gtk_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.1 2001/02/20 17:26:51 danh Exp $
--- gtk/Makefile.in.orig Wed May 24 21:11:04 2000
+++ gtk/Makefile.in Wed Jun 21 06:03:05 2000
@@ -125,7 +125,7 @@
+++ gtk/Makefile.in Tue Feb 20 12:21:32 2001
@@ -125,7 +125,7 @@ x_ldflags = @x_ldflags@
x_libs = @x_libs@
xinput_progs = @xinput_progs@
@ -9,7 +10,7 @@
#
@@ -135,7 +135,7 @@
@@ -135,7 +135,7 @@ lib_LTLIBRARIES = libgtk.la
# libtool stuff: set version and export symbols for resolving
libgtkincludedir = $(includedir)/gtk
@ -18,7 +19,7 @@
# $(top_builddir)/gdk/libgdk.la
@@ -190,7 +190,7 @@
@@ -190,7 +190,7 @@ EXTRA_DIST = $(gtk_private_h_sources) $
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
CLEANFILES = $(gen_sources)
@ -27,7 +28,7 @@
gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1255
@@ -503,7 +503,7 @@
@@ -503,7 +503,7 @@ install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
uninstall-libgtkincludeHEADERS uninstall-local
uninstall: uninstall-am

13
x11/gtk+/patches/patch-ai → x11/gtk+/patches/patch-gtk_gtkrc_c
View File

@ -1,6 +1,7 @@
--- gtk/gtkrc.c.orig Mon Jan 8 20:40:22 2001
+++ gtk/gtkrc.c Mon Jan 8 21:27:25 2001
@@ -245,9 +245,9 @@
$OpenBSD: patch-gtk_gtkrc_c,v 1.1 2001/02/20 17:26:51 danh Exp $
--- gtk/gtkrc.c.orig Wed Oct 20 10:41:16 1999
+++ gtk/gtkrc.c Tue Feb 20 12:21:37 2001
@@ -245,9 +245,9 @@ gtk_rc_get_module_dir(void)
var = getenv("GTK_EXE_PREFIX");
if (var)
@ -12,7 +13,7 @@
return path;
}
@@ -260,9 +260,9 @@
@@ -260,9 +260,9 @@ gtk_rc_append_default_pixmap_path(void)
var = getenv("GTK_DATA_PREFIX");
if (var)
@ -24,7 +25,7 @@
for (n = 0; pixmap_path[n]; n++) ;
if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
@@ -287,15 +287,15 @@
@@ -287,15 +287,15 @@ gtk_rc_append_default_module_path(void)
var = getenv("GTK_EXE_PREFIX");
if (var)
@ -43,7 +44,7 @@
module_path[n++] = g_strdup(path);
module_path[n] = NULL;
g_free(path);
@@ -329,7 +329,7 @@
@@ -329,7 +329,7 @@ gtk_rc_add_initial_default_files (void)
}
else
{

22
x11/gtk+/patches/patch-ah → x11/gtk+/patches/patch-ltconfig
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/02/20 17:26:51 danh Exp $
--- ltconfig.orig Fri Feb 4 13:29:21 2000
+++ ltconfig Mon Dec 25 17:07:08 2000
@@ -1105,6 +1105,9 @@
+++ ltconfig Tue Feb 20 12:23:13 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
@ -10,7 +11,7 @@
esac
@@ -1396,10 +1399,18 @@
@@ -1396,10 +1399,21 @@ else
;;
openbsd*)
@ -19,19 +20,22 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1997,13 +2008,10 @@
@@ -1997,13 +2011,10 @@ netbsd*)
openbsd*)
version_type=sunos

37
x11/gtk+/patches/patch-ad → x11/gtk+/patches/patch-ltmain_sh
View File

@ -1,6 +1,37 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 17:26:51 danh Exp $
--- ltmain.sh.orig Fri Feb 4 13:29:21 2000
+++ ltmain.sh Mon Dec 25 17:07:10 2000
@@ -1795,6 +1795,9 @@
+++ ltmain.sh Tue Feb 20 12:24:35 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
@ -10,7 +41,7 @@
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3555,40 +3558,6 @@
@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

13
x11/gtk+/patches/patch-af → x11/gtk+/patches/patch-po_Makefile_in_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/02/20 17:26:51 danh Exp $
--- po/Makefile.in.in.orig Wed May 24 20:31:44 2000
+++ po/Makefile.in.in Sun Aug 27 00:26:19 2000
@@ -69,7 +69,7 @@
+++ po/Makefile.in.in Tue Feb 20 12:21:35 2001
@@ -69,7 +69,7 @@ INSTOBJEXT = @INSTOBJEXT@
$(MSGFMT) -o $@ $<
.po.gmo:
@ -9,7 +10,7 @@
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
@@ -111,9 +111,9 @@
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
@ -21,7 +22,7 @@
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -123,7 +123,7 @@
@@ -123,7 +123,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
@ -30,7 +31,7 @@
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,12 +153,12 @@
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
@ -46,7 +47,7 @@
else \
: ; \
fi
@@ -171,12 +171,12 @@
@@ -171,12 +171,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \