fix 64bit warnings and another DESTDIR patch

Package-Manager: portage-2.0.53_rc7

5 files changed, 55 insertions, 7 deletions

diff --git a/dev-lang/swi-prolog-lite/ChangeLog b/dev-lang/swi-prolog-lite/ChangeLog
index dbef0d57015e..4c1fa494249a 100644
--- a/dev-lang/swi-prolog-lite/ChangeLog
+++ b/dev-lang/swi-prolog-lite/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for dev-lang/swi-prolog-lite
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/ChangeLog,v 1.22 2005/12/01 08:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/ChangeLog,v 1.23 2005/12/01 09:05:56 vapier Exp $
 
 *swi-prolog-lite-5.5.39 (01 Dec 2005)
 
   01 Dec 2005; Mike Frysinger <vapier@gentoo.org>
   +files/swi-prolog-lite-5.5.39-packages-mp-DESTDIR.patch,
+  +files/swi-prolog-lite-5.5.39-packages-ltx2htm-DESTDIR.patch,
+  +files/swi-prolog-lite-5.5.39-packages-semweb-64bit.patch,
   -swi-prolog-lite-5.5.36.ebuild, +swi-prolog-lite-5.5.39.ebuild:
   Version bump and fix sandbox error #114069.
 
diff --git a/dev-lang/swi-prolog-lite/Manifest b/dev-lang/swi-prolog-lite/Manifest
index 3f9a76a241d3..332f69a4d813 100644
--- a/dev-lang/swi-prolog-lite/Manifest
+++ b/dev-lang/swi-prolog-lite/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff4aff8518644b7da6b27b5e67835d9f ChangeLog 3247
+MD5 f56efb4fe44cfca905703450d295ca18 ChangeLog 3372
 MD5 8eed8feaa65a3ab28f60e67e609ed512 files/destdir.patch 488
 MD5 ac0b2bc6ebbb0b4d807dc2e7f88c0edf files/digest-swi-prolog-lite-5.0.10 67
 MD5 640ff31e82704bfbbd79ac576d005850 files/digest-swi-prolog-lite-5.1.13 62
@@ -13,18 +13,20 @@ MD5 e26e7dd2a9ab9cadfc1e456bff5cfb35 files/swi-prolog-lite-5.2.11-parallel-build
 MD5 fe36bbaacaf2c0a147d92541ba584670 files/swi-prolog-lite-5.3.14-parallel-build.patch 1534
 MD5 9b6190002d49e2d3ddefa40541c2ca85 files/swi-prolog-lite-5.4.7-install.patch 408
 MD5 5b26039ee25ba0666cd711bf838962d8 files/swi-prolog-lite-5.5.30-runtime-build.patch 309
+MD5 b498044bf1fdc8d27c5b5a399ba423e1 files/swi-prolog-lite-5.5.39-packages-ltx2htm-DESTDIR.patch 1138
 MD5 426062cdd96638f41290e4d0533b6056 files/swi-prolog-lite-5.5.39-packages-mp-DESTDIR.patch 824
+MD5 f69c969b54b8edba72f27dba32590241 files/swi-prolog-lite-5.5.39-packages-semweb-64bit.patch 617
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 MD5 279806ebf5d32d9c17d55d4ab837991e swi-prolog-lite-5.0.10.ebuild 1250
 MD5 5532502b84186d942b9e511ac418da60 swi-prolog-lite-5.1.13.ebuild 1243
 MD5 7d72dd5171c98a306021fbf58e52fb43 swi-prolog-lite-5.2.11.ebuild 1157
 MD5 e5130b48bc4c49b2a6c9fb96947892a7 swi-prolog-lite-5.3.14.ebuild 1153
 MD5 9604df1e2eb962f22c4e1a82e56dc79f swi-prolog-lite-5.4.7.ebuild 1212
-MD5 feeb52f2dec07e86064c77fd788ad600 swi-prolog-lite-5.5.39.ebuild 1681
+MD5 8d24a0928fdf917af7a407d94c159d87 swi-prolog-lite-5.5.39.ebuild 1794
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDjrljgIKl8Uu19MoRArn7AJ4l4rRbYfBNNaY+zEavjVLYK8C+ggCdHk2U
-/uJQqZY51D6GD4/YXnCPFCg=
-=PWm5
+iD8DBQFDjr2JgIKl8Uu19MoRAor6AJ9/uQ7Kf9axw5PdsYZeqprHINE0rQCfRafd
+V5JG5yPa4nY5QhUPTNM3mzk=
+=dRhT
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.5.39-packages-ltx2htm-DESTDIR.patch b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.5.39-packages-ltx2htm-DESTDIR.patch
new file mode 100644
index 000000000000..5e2889a06f8e
--- /dev/null
+++ b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.5.39-packages-ltx2htm-DESTDIR.patch
@@ -0,0 +1,26 @@
+Index: packages/ltx2htm/Makefile.in
+===================================================================
+RCS file: /usr/local/cvspl/pl/packages/ltx2htm/Makefile.in,v
+retrieving revision 1.5
+diff -u -p -r1.5 Makefile.in
+--- packages/ltx2htm/Makefile.in	30 Oct 2001 16:39:13 -0000	1.5
++++ packages/ltx2htm/Makefile.in	1 Dec 2005 08:58:15 -0000
+@@ -48,12 +48,12 @@ all:
+ 	@echo "==============================================================="
+ 
+ install:	tex.@SO@
+-	mkdir -p $(LIBDIR)/lib/$(PLARCH)
+-	$(INSTALL_DATA) tex.@SO@ $(LIBDIR)/lib/$(PLARCH)
+-	$(INSTALL_PROGRAM) latex2html $(bindir)
+-	for f in $(LIB); do $(INSTALL_DATA) $$f $(LIBDIR); done
+-	mkdir -p $(LIBDIR)/icons
+-	for f in icons/*.gif; do $(INSTALL_DATA) $$f $(LIBDIR)/icons; done
++	mkdir -p $(DESTDIR)$(LIBDIR)/lib/$(PLARCH)
++	$(INSTALL_DATA) tex.@SO@ $(DESTDIR)$(LIBDIR)/lib/$(PLARCH)
++	$(INSTALL_PROGRAM) latex2html $(DESTDIR)$(bindir)
++	for f in $(LIB); do $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDIR); done
++	mkdir -p $(DESTDIR)$(LIBDIR)/icons
++	for f in icons/*.gif; do $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDIR)/icons; done
+ 
+ tex.@SO@:		$(OBJ)
+ 	$(LD) $(LDFLAGS) -o $@ $(OBJ)
diff --git a/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.5.39-packages-semweb-64bit.patch b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.5.39-packages-semweb-64bit.patch
new file mode 100644
index 000000000000..fc83911e8287
--- /dev/null
+++ b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.5.39-packages-semweb-64bit.patch
@@ -0,0 +1,16 @@
+Index: packages/semweb/rdf_db.c
+===================================================================
+RCS file: /usr/local/cvspl/pl/packages/semweb/rdf_db.c,v
+retrieving revision 1.87
+diff -u -p -r1.87 rdf_db.c
+--- packages/semweb/rdf_db.c	12 Nov 2005 15:03:05 -0000	1.87
++++ packages/semweb/rdf_db.c	1 Dec 2005 08:52:40 -0000
+@@ -4842,7 +4842,7 @@ typedef struct agenda
+ } agenda;
+ 
+ #ifndef offsetof
+-#define offsetof(structure, field) ((int) &(((structure *)NULL)->field))
++#define offsetof(structure, field) ((unsigned long) &(((structure *)NULL)->field))
+ #endif
+ #define CHUNK_SIZE(n) offsetof(chunk, nodes[n])
+ 
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.39.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.39.ebuild
index 7ba3002afd8c..a6a41951d702 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.39.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.39.ebuild,v 1.1 2005/12/01 08:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.39.ebuild,v 1.2 2005/12/01 09:05:56 vapier Exp $
 
 inherit eutils
 
@@ -27,6 +27,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-packages-mp-DESTDIR.patch
+	epatch "${FILESDIR}"/${P}-packages-semweb-64bit.patch
+	epatch "${FILESDIR}"/${P}-packages-ltx2htm-DESTDIR.patch
 }
 
 src_compile() {