[gentoo-commits] gentoo-x86 commit in dev-tcltk/tdom/files: tdom-0.8.2-expat.patch tdom-0.8.2.patch tdom-0.8.2-tnc.patch

[Federico Ferri (mescalinum)]

mescalinum    08/12/04 20:14:06

  Added:                tdom-0.8.2-expat.patch tdom-0.8.2.patch
                        tdom-0.8.2-tnc.patch
  Log:
  add patches from openSuSE:11, fix bug #248173
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  dev-tcltk/tdom/files/tdom-0.8.2-expat.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch?rev=1.1&content-type=text/plain

Index: tdom-0.8.2-expat.patch
===================================================================
Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
Index: Makefile.in
================================================================================
--- configure.in
+++ configure.in
@@ -72,6 +72,7 @@
 #--------------------------------------------------------------------
 
 TDOM_PATH_AOLSERVER
+TDOM_PATH_EXPAT
 
 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -83,10 +84,7 @@
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------
 
-TEA_ADD_SOURCES([expat/xmlrole.c     \
-                 expat/xmltok.c      \
-                 expat/xmlparse.c    \
-                 generic/xmlsimple.c \
+TEA_ADD_SOURCES([generic/xmlsimple.c \
                  generic/utf8conv.c  \
                  generic/dom.c       \
                  generic/domalloc.c  \
@@ -100,7 +98,7 @@
                  generic/tclexpat.c  \
                  generic/tdomStubInit.c])
 TEA_ADD_HEADERS([generic/tdom.h])
-TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
 TEA_ADD_LIBS([${AOL_LIBS}])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
--- tdom.m4
+++ tdom.m4
@@ -215,6 +215,46 @@
     fi
 ])
 
+
+AC_DEFUN(TDOM_PATH_EXPAT, [
+    AC_MSG_CHECKING([for expat])
+    AC_ARG_WITH(expat, 
+        AC_HELP_STRING([--with-expat],
+            [directory with expat installation]), , [with_expat=no])
+
+    AC_CACHE_VAL(ac_cv_c_expat,[
+    case $with_expat in
+	no) ;;
+	yes)
+	    for f in /usr/local /usr; do
+	        if test -f "$f/include/expat.h" ; then
+		    ac_cv_c_expat=`(cd $f; pwd)`
+		    break
+		fi
+	    done
+	    ;;
+	*)
+	    if test -f "$with_expat/include/expat.h"; then
+		ac_cv_c_expat=`(cd $with_expat; pwd)`
+	    else
+        	AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
+	    fi
+    esac
+    ])
+    if test x"${ac_cv_c_expat}" = x ; then
+        AC_MSG_RESULT([using local copy])
+	TEA_ADD_SOURCES([expat/xmlrole.c     \
+                 	 expat/xmltok.c      \
+	                 expat/xmlparse.c])
+	TEA_ADD_INCLUDES([-I${srcdir}/expat])
+    else
+        AC_MSG_RESULT([${ac_cv_c_expat}])
+	TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
+	TEA_ADD_LIBS([-lexpat])
+    fi
+])
+
+
 #------------------------------------------------------------------------
 # TDOM_PATH_CONFIG --
 #



1.1                  dev-tcltk/tdom/files/tdom-0.8.2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tdom/files/tdom-0.8.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tdom/files/tdom-0.8.2.patch?rev=1.1&content-type=text/plain

Index: tdom-0.8.2.patch
===================================================================
Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
--- Makefile.in
+++ Makefile.in
@@ -307,7 +307,7 @@
 
 pkgIndex.tcl-hand:
 	@(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION)\
-	"load [list [file join $$dir $(PKG_LIB_FILE)]];\
+	"load $(PKG_LIB_FILE);\
          source [list [file join $$dir tdom.tcl]]"'\
 	) > pkgIndex.tcl
 
@@ -385,29 +385,30 @@
 #========================================================================
 
 install-lib-binaries: binaries
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(libdir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
 	    if test "x$$stub" = "xstub"; then \
-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
 	    else \
-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
 		if test -f $$lib; then \
-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
 		fi; \
 	    fi; \
 	  fi; \
 	done
+	@mkdir -p $(DESTDIR)$(pkglibdir)
 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    destp=`basename $$p`; \



1.1                  dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch?rev=1.1&content-type=text/plain

Index: tdom-0.8.2-tnc.patch
===================================================================
Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
--- extensions/tnc/Makefile.in
+++ extensions/tnc/Makefile.in
@@ -355,29 +355,30 @@
 #========================================================================
 
 install-lib-binaries: binaries
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(libdir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
 	    if test "x$$stub" = "xstub"; then \
-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
 	    else \
-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
 		if test -f $$lib; then \
-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
 		fi; \
 	    fi; \
 	  fi; \
 	done
+	@mkdir -p $(DESTDIR)$(pkglibdir)
 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    destp=`basename $$p`; \
--- extensions/tnc/configure.in
+++ extensions/tnc/configure.in
@@ -89,7 +89,7 @@
 if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
     TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
 else
-    TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
+    TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
 fi
 
 #--------------------------------------------------------------------
--- extensions/tnc/pkgIndex.tcl.in
+++ extensions/tnc/pkgIndex.tcl.in
@@ -2,4 +2,4 @@
 
 package ifneeded tnc @PACKAGE_VERSION@        \
     "package require tdom; \
-     [list load [file join $dir @PKG_LIB_FILE@] tnc]"
+     [list load @PKG_LIB_FILE@ tnc]"
--- extensions/tnc/Makefile.in
+++ extensions/tnc/Makefile.in
@@ -160,7 +160,7 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)
 CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= @CPPFLAGS@
-LIBS		= @PKG_LIBS@ @LIBS@
+LIBS		= @PKG_LIBS@ @LIBS@ -L../../unix/
 AR		= @AR@
 CFLAGS		= @CFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)