nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available.

Also rename to account for dependency changes:
    - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch =>
      0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
    - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch =>
      0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
    - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch =>
      0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
    - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch =>
      0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
    - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch =>
      0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
    - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch =>
      0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
    - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
      =>
      0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
    - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
      =>
      0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch

1 files changed, 0 insertions, 58 deletions

diff --git a/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
deleted file mode 100644
index 3099698c9..000000000
--- a/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
-Author: Clemens Lang <cal@macports.org>
-
---- a/nxcompshad/Makefile.in
-+++ b/nxcompshad/Makefile.in
-@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/u
- LIBRARY = Xcompshad
- 
- LIBNAME    = lib$(LIBRARY)
-+ifeq ($(shell uname),Darwin)
-+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
-+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
-+LIBSHARED  = lib$(LIBRARY).dylib
-+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
-+else
- LIBFULL    = lib$(LIBRARY).so.$(VERSION)
- LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
- LIBSHARED  = lib$(LIBRARY).so
-+LIBFLAGS   =
-+endif
- LIBARCHIVE = lib$(LIBRARY).a
- 
- MSRC   = Main.c
-@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBS
- endif
- 
- $(LIBFULL):	$(CXXOBJ) $(COBJ)
--		$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
-+		$(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
- 
- $(LIBLOAD):	$(LIBFULL)
- 		rm -f $(LIBLOAD)
-@@ -193,9 +201,9 @@ install.lib: all
- 	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
- 	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
- 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
--	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}
--	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}
--	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
-+	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
- 	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
- 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
- 
-@@ -207,9 +215,9 @@ uninstall.bin:
- 
- uninstall.lib:
- 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
--	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
--	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
--	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
-+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
-+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
-+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
- 	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
- 	$(RM_DIR) $(DESTDIR)${libdir}/nx/
- 	$(RM_DIR) $(DESTDIR)${includedir}/nx/