cdk: patch update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@6 18ef50b8-d735-4ccd-97c1-689132df3dd9

1 files changed, 28 insertions, 49 deletions

diff --git a/dev/libs/cdk/cdk-5.0.20050424.diff b/dev/libs/cdk/cdk-5.0.20050424.diff
index 630b430..86aad32 100644
--- a/dev/libs/cdk/cdk-5.0.20050424.diff
+++ b/dev/libs/cdk/cdk-5.0.20050424.diff
@@ -1,6 +1,6 @@
 diff -Naur libcdk5-5.0.20050424.orig.orig/Makefile.in libcdk5-5.0.20050424.orig/Makefile.in
 --- libcdk5-5.0.20050424.orig.orig/Makefile.in	2005-07-28 10:44:02.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/Makefile.in	2007-09-13 13:33:01.000000000 -0300
++++ libcdk5-5.0.20050424.orig/Makefile.in	2007-09-13 15:22:54.000000000 -0300
 @@ -61,7 +61,7 @@
  libdir		= $(DESTDIR)@libdir@
  mandir		= $(DESTDIR)@mandir@
@@ -22,25 +22,14 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/Makefile.in libcdk5-5.0.20050424.orig/
  	done
  
  uninstall \
-@@ -322,13 +323,14 @@
+@@ -322,6 +323,7 @@
  install \
  installCDKManPages :: headers.sed $(AUTO_MAN) $(MAN_DIR)
  	@echo "Installing the CDK man pages in $(MAN_DIR) ..."
-+	@mkdir -p ${DESTDIR}/${MAN_DIR}
++	@mkdir -p $(MAN_DIR)
  	@for i in $(AUTO_MAN); do \
--	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(MAN_DIR) -s . $$i; \
--	   $(SHELL) $(srcdir)/manlinks.sh installing $(srcdir) $(MAN_DIR) $$i;  \
-+	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d ${DESTDIR}/$(MAN_DIR) -s . $$i; \
-+	   $(SHELL) $(srcdir)/manlinks.sh installing $(srcdir) ${DESTDIR}/$(MAN_DIR) $$i;  \
- 	done
- 	@for i in $(CDKMAN); do \
--	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(MAN_DIR) -s . $(srcdir)/man/$$i; \
--	   $(SHELL) $(srcdir)/manlinks.sh installing $(srcdir) $(MAN_DIR) $(srcdir)/man/$$i;  \
-+	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d ${DESTDIR}/$(MAN_DIR) -s . $(srcdir)/man/$$i; \
-+	   $(SHELL) $(srcdir)/manlinks.sh installing $(srcdir) ${DESTDIR}/$(MAN_DIR) $(srcdir)/man/$$i;  \
- 	done
- 
- uninstall \
+ 	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(MAN_DIR) -s . $$i; \
+ 	   $(SHELL) $(srcdir)/manlinks.sh installing $(srcdir) $(MAN_DIR) $$i;  \
 @@ -336,7 +338,7 @@
  	@echo "Uninstalling the CDK man pages from $(MAN_DIR) ..."
  	@- for i in $(AUTO_MAN); do \
@@ -50,40 +39,30 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/Makefile.in libcdk5-5.0.20050424.orig/
  	done
  	@- for i in $(CDKMAN); do \
  	   $(RM) $(MAN_DIR)/$$i; \
-@@ -349,9 +351,10 @@
+@@ -349,6 +351,7 @@
  install \
  installCDKHeaderFiles :: headers.sed $(MY_HDR) $(INCLUDE_DIR)
  	@echo "Installing CDK header files in $(INCLUDE_DIR)..."
--	$(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(INCLUDE_DIR) -s $(srcdir) $(MY_HDR)
-+	@mkdir -p ${DESTDIR}/${INCLUDE_DIR}
-+	$(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d ${DESTDIR}/$(INCLUDE_DIR) -s $(srcdir) $(MY_HDR)
++	@mkdir -p $(INCLUDE_DIR)
+ 	$(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(INCLUDE_DIR) -s $(srcdir) $(MY_HDR)
  	@for i in $(CDKHDR); do \
--	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(INCLUDE_DIR) -s $(srcdir) include/$$i; \
-+	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d ${DESTDIR}/$(INCLUDE_DIR) -s $(srcdir) include/$$i; \
- 	done
- 
- uninstall \
-@@ -370,7 +373,8 @@
+ 	   $(SHELL) $(srcdir)/headers.sh -x "$(INSTALL_DATA)" -d $(INCLUDE_DIR) -s $(srcdir) include/$$i; \
+@@ -370,6 +373,7 @@
  install \
  installCDKLibrary :: $(LIB_DIR) $(CDKLIB)
  	@echo "Installing CDK library"
--	@$(INSTALL_LIB) $(CDKLIB) $(LIB_DIR)/$(CDKLIB)
-+	@mkdir -p ${DESTDIR}/${LIB_DIR}
-+	@$(INSTALL_LIB) $(CDKLIB) ${DESTDIR}/$(LIB_DIR)/$(CDKLIB)
++	@mkdir -p $(LIB_DIR)
+ 	@$(INSTALL_LIB) $(CDKLIB) $(LIB_DIR)/$(CDKLIB)
  
  uninstall \
- uninstallCDKLibrary ::
-@@ -383,8 +387,9 @@
+@@ -383,6 +387,7 @@
  #
  installCDKSHLibrary :: $(LIB_DIR) $(CDKSHLIB)
  	@echo "Installing CDK library"
-+	@mkdir -p ${DESTDIR}/${LIB_DIR}
++	@mkdir -p $(LIB_DIR)
  	@echo "	$(INSTALL_DATA) $(CDKSHLIB) $(LIB_DIR)"
--	@$(INSTALL_DATA) $(CDKSHLIB) $(LIB_DIR)
-+	@$(INSTALL_DATA) $(CDKSHLIB) ${DESTDIR}/$(LIB_DIR)
+ 	@$(INSTALL_DATA) $(CDKSHLIB) $(LIB_DIR)
  	@echo " ln -sf $(CDKSHLIB) $(LIB_DIR)/@LIB_PREFIX@@LIB_ROOTNAME@.so"
- 	@ln -sf $(CDKSHLIB) $(LIB_DIR)/@LIB_PREFIX@@LIB_ROOTNAME@.so
- 
 @@ -456,7 +461,7 @@
  $(DOCUMENT_DIR) \
  $(INCLUDE_DIR) \
@@ -95,7 +74,7 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/Makefile.in libcdk5-5.0.20050424.orig/
  # Files generated from templates:
 diff -Naur libcdk5-5.0.20050424.orig.orig/config.guess libcdk5-5.0.20050424.orig/config.guess
 --- libcdk5-5.0.20050424.orig.orig/config.guess	2005-07-28 10:44:01.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/config.guess	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/config.guess	2007-09-13 15:22:44.000000000 -0300
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -161,7 +140,7 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/config.guess libcdk5-5.0.20050424.orig
  send the following data and any information you think might be
 diff -Naur libcdk5-5.0.20050424.orig.orig/config.sub libcdk5-5.0.20050424.orig/config.sub
 --- libcdk5-5.0.20050424.orig.orig/config.sub	2005-07-28 10:44:01.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/config.sub	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/config.sub	2007-09-13 15:22:44.000000000 -0300
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -239,7 +218,7 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/config.sub libcdk5-5.0.20050424.orig/c
  	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/changelog libcdk5-5.0.20050424.orig/debian/changelog
 --- libcdk5-5.0.20050424.orig.orig/debian/changelog	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/changelog	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/changelog	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,90 @@
 +libcdk5 (5.0.20050424-2) unstable; urgency=low
 +
@@ -333,12 +312,12 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/debian/changelog libcdk5-5.0.20050424.
 +
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/compat libcdk5-5.0.20050424.orig/debian/compat
 --- libcdk5-5.0.20050424.orig.orig/debian/compat	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/compat	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/compat	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1 @@
 +4
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/control libcdk5-5.0.20050424.orig/debian/control
 --- libcdk5-5.0.20050424.orig.orig/debian/control	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/control	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/control	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,36 @@
 +Source: libcdk5
 +Section: libs
@@ -378,7 +357,7 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/debian/control libcdk5-5.0.20050424.or
 + Home page: http://invisible-island.net/cdk/
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/copyright libcdk5-5.0.20050424.orig/debian/copyright
 --- libcdk5-5.0.20050424.orig.orig/debian/copyright	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/copyright	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/copyright	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,50 @@
 +This Debian package of libcdk was initially put together by Raphael
 +Bossek <bossekr@debian.org>; later maintainers are listed in the
@@ -432,19 +411,19 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/debian/copyright libcdk5-5.0.20050424.
 + */
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.dirs libcdk5-5.0.20050424.orig/debian/libcdk5-dev.dirs
 --- libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.dirs	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.dirs	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.dirs	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,2 @@
 +usr/lib
 +usr/include
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.examples libcdk5-5.0.20050424.orig/debian/libcdk5-dev.examples
 --- libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.examples	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.examples	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.examples	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,2 @@
 +examples/.
 +demos
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.install libcdk5-5.0.20050424.orig/debian/libcdk5-dev.install
 --- libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.install	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.install	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.install	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,8 @@
 +usr/include/*
 +usr/lib/lib*.a
@@ -456,23 +435,23 @@ diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.install libcdk5-5.0
 +usr/share/doc/*
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.manpages libcdk5-5.0.20050424.orig/debian/libcdk5-dev.manpages
 --- libcdk5-5.0.20050424.orig.orig/debian/libcdk5-dev.manpages	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.manpages	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/libcdk5-dev.manpages	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,2 @@
 +man/*.3
 +debian/man/*.3
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5.dirs libcdk5-5.0.20050424.orig/debian/libcdk5.dirs
 --- libcdk5-5.0.20050424.orig.orig/debian/libcdk5.dirs	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/libcdk5.dirs	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/libcdk5.dirs	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1 @@
 +usr/lib
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/libcdk5.install libcdk5-5.0.20050424.orig/debian/libcdk5.install
 --- libcdk5-5.0.20050424.orig.orig/debian/libcdk5.install	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/libcdk5.install	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/libcdk5.install	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1 @@
 +usr/lib/lib*.so.*
 diff -Naur libcdk5-5.0.20050424.orig.orig/debian/rules libcdk5-5.0.20050424.orig/debian/rules
 --- libcdk5-5.0.20050424.orig.orig/debian/rules	1969-12-31 21:00:00.000000000 -0300
-+++ libcdk5-5.0.20050424.orig/debian/rules	2007-09-13 13:32:55.000000000 -0300
++++ libcdk5-5.0.20050424.orig/debian/rules	2007-09-13 15:22:44.000000000 -0300
 @@ -0,0 +1,121 @@
 +#!/usr/bin/make -f
 +# -*- makefile -*-