diff options
Diffstat (limited to 'x11/libX11/patches/patch-ae')
-rw-r--r-- | x11/libX11/patches/patch-ae | 171 |
1 files changed, 0 insertions, 171 deletions
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae deleted file mode 100644 index e5686d02067..00000000000 --- a/x11/libX11/patches/patch-ae +++ /dev/null @@ -1,171 +0,0 @@ -$NetBSD: patch-ae,v 1.7 2010/01/15 18:55:11 tnn Exp $ - ---- src/util/Makefile.in.orig 2009-10-23 20:55:44.000000000 +0000 -+++ src/util/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -36,7 +36,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = makekeys$(EXEEXT) -+noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG) - subdir = src/util - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -59,6 +59,9 @@ am__v_lt_0 = --silent - makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+xmakekeys_SOURCES = xmakekeys.c -+xmakekeys_OBJECTS = xmakekeys.$(OBJEXT) -+xmakekeys_LDADD = $(LDADD) - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -81,8 +84,8 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_GEN = $(am__v_GEN_$(V)) - am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; --SOURCES = makekeys.c --DIST_SOURCES = makekeys.c -+SOURCES = makekeys.c xmakekeys.c -+DIST_SOURCES = makekeys.c xmakekeys.c - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -108,10 +111,6 @@ CHANGELOG_CMD = @CHANGELOG_CMD@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CWARNFLAGS = @CWARNFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -@@ -119,26 +118,27 @@ DOLT_BASH = @DOLT_BASH@ - DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ - DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ - DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - FILE_MAN_DIR = @FILE_MAN_DIR@ - FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ - GREP = @GREP@ - GROFF = @GROFF@ - I18N_MODULE_LIBS = @I18N_MODULE_LIBS@ - INSTALL = @INSTALL@ -+INSTALL_CMD = @INSTALL_CMD@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - KEYSYMDEF = @KEYSYMDEF@ - LAUNCHD = @LAUNCHD@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ -@@ -148,6 +148,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ - LINT = @LINT@ - LINTLIB = @LINTLIB@ - LINT_FLAGS = @LINT_FLAGS@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTCOMPILE = @LTCOMPILE@ - LTCXXCOMPILE = @LTCXXCOMPILE@ -@@ -158,13 +159,18 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS - MISC_MAN_DIR = @MISC_MAN_DIR@ - MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ - MKDIR_P = @MKDIR_P@ -+NM = @NM@ - NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ -@@ -208,8 +214,7 @@ abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -224,7 +229,6 @@ build_vendor = @build_vendor@ - builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ --distcleancheck_listfiles = @distcleancheck_listfiles@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ -@@ -241,6 +245,7 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -257,6 +262,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - makekeys_CFLAGS = $(X11_CFLAGS) -+@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT) - EXTRA_DIST = mkks.sh - - # Check source code with tools like lint & sparse -@@ -309,6 +315,9 @@ clean-noinstPROGRAMS: - makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) - @rm -f makekeys$(EXEEXT) - $(AM_V_CCLD)$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS) -+@CROSS_COMPILING_FALSE@xmakekeys$(EXEEXT): $(xmakekeys_OBJECTS) $(xmakekeys_DEPENDENCIES) -+@CROSS_COMPILING_FALSE@ @rm -f xmakekeys$(EXEEXT) -+@CROSS_COMPILING_FALSE@ $(AM_V_CCLD)$(LINK) $(xmakekeys_OBJECTS) $(xmakekeys_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -317,6 +326,7 @@ distclean-compile: - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmakekeys.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -561,6 +571,9 @@ uninstall-am: - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -+@CROSS_COMPILING_TRUE@xmakekeys$(EXEEXT): makekeys.c -+@CROSS_COMPILING_TRUE@ $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \ -+@CROSS_COMPILING_TRUE@ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c - - @LINT_TRUE@lint: - @LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) makekeys.c |