move the changes into the original automake file

devel/binutils/stable/patches/patch-binutils_Makefile_am

@@ -0,0 +1,49 @@
+$OpenBSD: patch-binutils_Makefile_am,v 1.1 2004/01/18 23:50:48 brad Exp $
+--- binutils/Makefile.am.orig	2003-03-24 06:28:35.000000000 -0500
++++ binutils/Makefile.am	2004-01-18 17:40:28.000000000 -0500
+@@ -41,7 +41,7 @@ OBJDUMP_PROG=objdump
+ 
+ # This is the demangler, as a standalone program.
+ # Note: This one is used as the installed name too, unlike the above.
+-DEMANGLER_PROG=cxxfilt
++#DEMANGLER_PROG=cxxfilt
+ 
+ ADDR2LINE_PROG=addr2line
+ 
+@@ -58,7 +58,8 @@ bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PR
+ 
+ ## We need a special rule to install the programs which are built with
+ ## -new, and to rename cxxfilt to c++filt.
+-noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
++#noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
++noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG)
+ 
+ EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(DLLWRAP_PROG)
+ 
+@@ -111,7 +112,7 @@ BFDLIB = ../bfd/libbfd.la
+ 
+ OPCODES = ../opcodes/libopcodes.la
+ 
+-LIBIBERTY = ../libiberty/libiberty.a
++LIBIBERTY = -liberty
+ 
+ POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
+ po/POTFILES.in: @MAINT@ Makefile
+@@ -180,7 +181,7 @@ objdump_LDADD = $(OPCODES) $(BFDLIB) $(L
+ objdump.o:objdump.c
+ 	$(COMPILE) -c $(OBJDUMP_DEFS) $(srcdir)/objdump.c
+ 
+-cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
++#cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
+ 
+ ar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
+ 	emul_$(EMULATION).c $(BULIBS)
+@@ -341,7 +342,7 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
+ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ 	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	  else :; fi; \
+ 	done

devel/binutils/stable/patches/patch-binutils_Makefile_in

@@ -1,144 +0,0 @@
-$OpenBSD: patch-binutils_Makefile_in,v 1.7 2004/01/12 06:27:19 brad Exp $
---- binutils/Makefile.in.orig	2003-03-24 06:28:35.000000000 -0500
-+++ binutils/Makefile.in	2004-01-02 20:22:45.000000000 -0500
-@@ -153,7 +153,7 @@ OBJDUMP_PROG = objdump
- 
- # This is the demangler, as a standalone program.
- # Note: This one is used as the installed name too, unlike the above.
--DEMANGLER_PROG = cxxfilt
-+#DEMANGLER_PROG = cxxfilt
- 
- ADDR2LINE_PROG = addr2line
- 
-@@ -225,7 +225,7 @@ BFDLIB = ../bfd/libbfd.la
- 
- OPCODES = ../opcodes/libopcodes.la
- 
--LIBIBERTY = ../libiberty/libiberty.a
-+LIBIBERTY = -liberty
- 
- POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
- 
-@@ -337,95 +337,94 @@ LIBS = @LIBS@
- nlmconv_OBJECTS =  nlmconv.$(OBJEXT) nlmheader.$(OBJEXT) \
- bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
- nlmconv_LDADD = $(LDADD)
--nlmconv_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+nlmconv_DEPENDENCIES =  ../bfd/libbfd.la
- nlmconv_LDFLAGS = 
- srconv_OBJECTS =  srconv.$(OBJEXT) coffgrok.$(OBJEXT) bucomm.$(OBJEXT) \
- version.$(OBJEXT) filemode.$(OBJEXT)
- srconv_LDADD = $(LDADD)
--srconv_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+srconv_DEPENDENCIES =  ../bfd/libbfd.la
- srconv_LDFLAGS = 
- sysdump_OBJECTS =  sysdump.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \
- filemode.$(OBJEXT)
- sysdump_LDADD = $(LDADD)
--sysdump_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+sysdump_DEPENDENCIES =  ../bfd/libbfd.la
- sysdump_LDFLAGS = 
- coffdump_OBJECTS =  coffdump.$(OBJEXT) coffgrok.$(OBJEXT) \
- bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
- coffdump_LDADD = $(LDADD)
--coffdump_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+coffdump_DEPENDENCIES =  ../bfd/libbfd.la
- coffdump_LDFLAGS = 
- dlltool_OBJECTS =  dlltool.$(OBJEXT) defparse.$(OBJEXT) deflex.$(OBJEXT) \
- bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
--dlltool_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+dlltool_DEPENDENCIES =  ../bfd/libbfd.la
- dlltool_LDFLAGS = 
- windres_OBJECTS =  windres.$(OBJEXT) resrc.$(OBJEXT) rescoff.$(OBJEXT) \
- resbin.$(OBJEXT) rcparse.$(OBJEXT) rclex.$(OBJEXT) winduni.$(OBJEXT) \
- resres.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
--windres_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+windres_DEPENDENCIES =  ../bfd/libbfd.la
- windres_LDFLAGS = 
- dllwrap_OBJECTS =  dllwrap.$(OBJEXT) version.$(OBJEXT)
--dllwrap_DEPENDENCIES =  ../libiberty/libiberty.a
-+dllwrap_DEPENDENCIES = 
- dllwrap_LDFLAGS = 
- size_OBJECTS =  size.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \
- filemode.$(OBJEXT)
- size_LDADD = $(LDADD)
--size_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+size_DEPENDENCIES =  ../bfd/libbfd.la
- size_LDFLAGS = 
- objdump_OBJECTS =  objdump.$(OBJEXT) budemang.$(OBJEXT) prdbg.$(OBJEXT) \
- rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) ieee.$(OBJEXT) \
- rdcoff.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
--objdump_DEPENDENCIES =  ../opcodes/libopcodes.la ../bfd/libbfd.la \
--../libiberty/libiberty.a
-+objdump_DEPENDENCIES =  ../opcodes/libopcodes.la ../bfd/libbfd.la
- objdump_LDFLAGS = 
- ar_OBJECTS =  arparse.$(OBJEXT) arlex.$(OBJEXT) ar.$(OBJEXT) \
- not-ranlib.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) binemul.$(OBJEXT) \
- emul_$(EMULATION).$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \
- filemode.$(OBJEXT)
--ar_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+ar_DEPENDENCIES =  ../bfd/libbfd.la
- ar_LDFLAGS = 
- strings_OBJECTS =  strings.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \
- filemode.$(OBJEXT)
- strings_LDADD = $(LDADD)
--strings_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+strings_DEPENDENCIES =  ../bfd/libbfd.la
- strings_LDFLAGS = 
- ranlib_OBJECTS =  ar.$(OBJEXT) is-ranlib.$(OBJEXT) arparse.$(OBJEXT) \
- arlex.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) binemul.$(OBJEXT) \
- emul_$(EMULATION).$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \
- filemode.$(OBJEXT)
--ranlib_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+ranlib_DEPENDENCIES =  ../bfd/libbfd.la
- ranlib_LDFLAGS = 
- objcopy_OBJECTS =  objcopy.$(OBJEXT) not-strip.$(OBJEXT) \
- rename.$(OBJEXT) rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \
- ieee.$(OBJEXT) rdcoff.$(OBJEXT) wrstabs.$(OBJEXT) bucomm.$(OBJEXT) \
- version.$(OBJEXT) filemode.$(OBJEXT)
- objcopy_LDADD = $(LDADD)
--objcopy_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+objcopy_DEPENDENCIES =  ../bfd/libbfd.la
- objcopy_LDFLAGS = 
- addr2line_OBJECTS =  addr2line.$(OBJEXT) budemang.$(OBJEXT) \
- bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
- addr2line_LDADD = $(LDADD)
--addr2line_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+addr2line_DEPENDENCIES =  ../bfd/libbfd.la
- addr2line_LDFLAGS = 
- readelf_OBJECTS =  readelf.$(OBJEXT) version.$(OBJEXT) \
- unwind-ia64.$(OBJEXT)
--readelf_DEPENDENCIES =  ../libiberty/libiberty.a
-+readelf_DEPENDENCIES = 
- readelf_LDFLAGS = 
- nm_new_OBJECTS =  nm.$(OBJEXT) budemang.$(OBJEXT) bucomm.$(OBJEXT) \
- version.$(OBJEXT) filemode.$(OBJEXT)
- nm_new_LDADD = $(LDADD)
--nm_new_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+nm_new_DEPENDENCIES =  ../bfd/libbfd.la
- nm_new_LDFLAGS = 
- strip_new_OBJECTS =  objcopy.$(OBJEXT) is-strip.$(OBJEXT) \
- rename.$(OBJEXT) rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \
- ieee.$(OBJEXT) rdcoff.$(OBJEXT) wrstabs.$(OBJEXT) bucomm.$(OBJEXT) \
- version.$(OBJEXT) filemode.$(OBJEXT)
- strip_new_LDADD = $(LDADD)
--strip_new_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+strip_new_DEPENDENCIES =  ../bfd/libbfd.la
- strip_new_LDFLAGS = 
- cxxfilt_OBJECTS =  cxxfilt.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \
- filemode.$(OBJEXT)
- cxxfilt_LDADD = $(LDADD)
--cxxfilt_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-+cxxfilt_DEPENDENCIES =  ../bfd/libbfd.la
- cxxfilt_LDFLAGS = 
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LEXLIB = @LEXLIB@
-@@ -1069,7 +1068,7 @@ mostlyclean-local:
- install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
- 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- 	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done