From c2a774d0827605c702f6fde542877b59ecc74bad Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 21 Oct 2009 11:05:17 +0000
Subject: Remove two more Mac OS X patches which are don't seem to be required
 as requested by wizd(8).

---
 lang/python26/patches/patch-al | 80 ------------------------------------------
 lang/python26/patches/patch-au | 27 --------------
 2 files changed, 107 deletions(-)
 delete mode 100644 lang/python26/patches/patch-al
 delete mode 100644 lang/python26/patches/patch-au

(limited to 'lang/python26/patches')

diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al
deleted file mode 100644
index aa2b11bd1f7..00000000000
--- a/lang/python26/patches/patch-al
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
-
---- configure.orig	2009-03-30 17:56:14.000000000 +0000
-+++ configure
-@@ -4108,17 +4108,18 @@ _ACEOF
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
-           ;;
--    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*)
- 	  LDLIBRARY='libpython$(VERSION).so'
- 	  BLDLIBRARY='-L. -lpython$(VERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
--	  case $ac_sys_system in
--	      FreeBSD*)
--		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
--		;;
--	  esac
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  ;;
-+    Darwin*)
-+	  LDLIBRARY='libpython$(VERSION).dylib'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=DYLD_FALLBACK_LIBRARY_PATH=`pwd`:${DYLD_FALLBACK_LIBRARY_PATH}
-+	  INSTSONAME="$LDLIBRARY"
-+	  ;;
-     hp*|HP*)
- 	  case `uname -m` in
- 		ia64)
-@@ -13064,8 +13065,8 @@ then
- 			LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- 		else
- 			# No framework, use the Python app as bundle-loader
--			BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
--			LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+			BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+			LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- 		fi ;;
- 	Darwin/*)
- 		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -13086,12 +13087,12 @@ then
- 				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- 			else
- 				# No framework, use the Python app as bundle-loader
--				BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
--				LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+				BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+				LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- 			fi
- 		fi
- 		;;
--	Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
-+	Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";;
- 	BSD/OS*/4*) LDSHARED="gcc -shared";;
- 	FreeBSD*)
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -13115,6 +13116,7 @@ then
- 				esac
- 		fi;;
- 	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
-+	Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
- 	OpenUNIX*|UnixWare*)
- 		if test "$GCC" = "yes"
- 		then LDSHARED='$(CC) -shared'
-@@ -13150,6 +13152,7 @@ then
- 	Linux*|GNU*) CCSHARED="-fPIC";;
- 	BSD/OS*/4*) CCSHARED="-fpic";;
- 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
-+	Interix*) CCSHARED="";;
- 	OpenUNIX*|UnixWare*)
- 		if test "$GCC" = "yes"
- 		then CCSHARED="-fPIC"
-@@ -13207,6 +13210,7 @@ then
- 		then
- 			LINKFORSHARED="-Wl,--export-dynamic"
- 		fi;;
-+	Interix*) LINKFORSHARED="-Wl,-E";;
- 	SunOS/5*) case $CC in
- 		  *gcc*)
- 		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
diff --git a/lang/python26/patches/patch-au b/lang/python26/patches/patch-au
deleted file mode 100644
index 137013c132d..00000000000
--- a/lang/python26/patches/patch-au
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-au,v 1.3 2009/10/21 06:36:04 wiz Exp $
-
---- Makefile.pre.in.orig	2009-02-24 11:07:44.000000000 +0000
-+++ Makefile.pre.in
-@@ -425,6 +425,12 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJ
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
- 	$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
- 
-+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
-+	$(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ \
-+	    -current_version 2.6.3 -compatibility_version $(VERSION) \
-+	    -o $@ -flat_namespace -undefined suppress $(LDFLAGS) \
-+	    $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
-+
- # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
- # minimal framework (not including the Lib directory and such) in the current
- # directory.
-@@ -785,7 +791,8 @@ altbininstall:	$(BUILDPYTHON)
- 				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
- 			fi \
- 		fi; \
--	else	true; \
-+	elif test -f $(INSTSONAME); then \
-+		$(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \
- 	fi
- 
- # Install the manual page
-- 
cgit v1.2.3