Some more patches to make the package work on Solaris.

The CFLAGS, LDFLAGS and LIBS are taken from pkgsrc, so PKGREVISION++.

6 files changed, 81 insertions, 9 deletions

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index fa65982b1b7..a6c279b131b 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/12/13 02:00:29 obache Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/22 14:33:31 rillig Exp $
 #
 
 DISTNAME=	git-1.4.4.1
 PKGNAME=	scm${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
@@ -17,6 +17,7 @@ BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
 MAKE_ENV+=	DESTDIR=""
 MAKE_ENV+=	HOME=${PREFIX:Q}
+USE_LANGUAGES=	c99
 USE_TOOLS+=	gmake perl:run sh:run
 EXTRACT_USING=	gtar
 
@@ -27,6 +28,8 @@ MAKE_ENV+=	SHELL_PATH=${SH:Q}
 BUILD_TARGET=	all doc
 INSTALL_TARGET=	install install-doc
 MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
+LDFLAGS=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LIBS.SunOS+=	-liconv
 
 PERL5_PACKLIST=	auto/Git/.packlist
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/perl
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index dbcb2079d46..349dc1a99db 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/12/13 02:00:29 obache Exp $
+$NetBSD: distinfo,v 1.4 2007/01/22 14:33:31 rillig Exp $
 
 SHA1 (git-1.4.4.1.tar.gz) = 5e22daf46866068fd2734ddab3f2a0ca7cc517a8
 RMD160 (git-1.4.4.1.tar.gz) = 7881c835a382a001267ff89d0d738a1de97ffb95
 Size (git-1.4.4.1.tar.gz) = 1052897 bytes
-SHA1 (patch-aa) = f57f0591732647e161108546ee816736983d7c4f
+SHA1 (patch-aa) = 8901ddf3f60035d053a21c0afb540c1cdcf035c2
+SHA1 (patch-ab) = 89872ba1d182230359582c8c2c35424c045ee381
+SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc
+SHA1 (patch-ad) = 4fbd861a46c01b83fb6548378a523a52b52f5c75
diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa
index 013d4834150..1ed05f33b64 100644
--- a/devel/scmgit/patches/patch-aa
+++ b/devel/scmgit/patches/patch-aa
@@ -1,12 +1,31 @@
-$NetBSD: patch-aa,v 1.3 2006/12/13 02:00:29 obache Exp $
+$NetBSD: patch-aa,v 1.4 2007/01/22 14:33:31 rillig Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
+CFLAGS, LDFLAGS and LIBS should be taken from the environment.
+
 Install perl modules into the "vendor" directories.
 
---- Makefile.orig	2006-11-23 02:38:07.000000000 +0000
-+++ Makefile
-@@ -393,9 +393,7 @@ ifeq ($(uname_S),OpenBSD)
+--- Makefile.orig	2006-11-23 03:38:07.000000000 +0100
++++ Makefile	2007-01-22 15:17:52.611639144 +0100
+@@ -106,8 +106,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+ 
+ # CFLAGS and LDFLAGS are for the users to override from the command line.
+ 
+-CFLAGS = -g -O2 -Wall
+-LDFLAGS =
+ ALL_CFLAGS = $(CFLAGS)
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+@@ -348,6 +346,7 @@ ifeq ($(uname_S),Darwin)
+ 	endif
+ endif
+ ifeq ($(uname_S),SunOS)
++	NEEDS_LIBICONV = YesPlease
+ 	NEEDS_SOCKET = YesPlease
+ 	NEEDS_NSL = YesPlease
+ 	SHELL_PATH = /bin/bash
+@@ -393,9 +392,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -17,7 +36,16 @@ Install perl modules into the "vendor" directories.
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -769,7 +767,7 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
+@@ -577,7 +574,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PAT
+ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
+ GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
+ 
+-LIBS = $(GITLIBS) $(EXTLIBS)
++LIBS += $(GITLIBS) $(EXTLIBS)
+ 
+ BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
+ LIB_OBJS += $(COMPAT_OBJS)
+@@ -769,7 +766,7 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
  
  perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
  	(cd perl && $(PERL_PATH) Makefile.PL \
diff --git a/devel/scmgit/patches/patch-ab b/devel/scmgit/patches/patch-ab
new file mode 100644
index 00000000000..e690c4411c4
--- /dev/null
+++ b/devel/scmgit/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/01/22 14:33:31 rillig Exp $
+
+--- git-compat-util.h.orig	2006-07-02 08:23:24.000000000 +0200
++++ git-compat-util.h	2006-09-16 14:44:18.951236060 +0200
+@@ -4,6 +4,8 @@
+ #ifndef FLEX_ARRAY
+ #if defined(__GNUC__) && (__GNUC__ < 3)
+ #define FLEX_ARRAY 0
++#elif defined(__SUNPRO_C)
++#define FLEX_ARRAY 1
+ #else
+ #define FLEX_ARRAY /* empty */
+ #endif
diff --git a/devel/scmgit/patches/patch-ac b/devel/scmgit/patches/patch-ac
new file mode 100644
index 00000000000..8e7a72d8b43
--- /dev/null
+++ b/devel/scmgit/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/01/22 14:33:31 rillig Exp $
+
+--- cache.h.orig	2006-11-23 03:38:07.000000000 +0100
++++ cache.h	2007-01-20 03:01:16.958825320 +0100
+@@ -6,7 +6,7 @@
+ #include SHA1_HEADER
+ #include <zlib.h>
+ 
+-#if ZLIB_VERNUM < 0x1200
++#if ZLIB_VERNUM < 0x1200 || !defined(deflateBound)
+ #define deflateBound(c,s)  ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
+ #endif
+ 
diff --git a/devel/scmgit/patches/patch-ad b/devel/scmgit/patches/patch-ad
new file mode 100644
index 00000000000..2febdc37656
--- /dev/null
+++ b/devel/scmgit/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2007/01/22 14:33:31 rillig Exp $
+
+--- convert-objects.c.orig	2006-11-23 03:38:07.000000000 +0100
++++ convert-objects.c	2007-01-22 14:57:28.302368232 +0100
+@@ -1,5 +1,7 @@
+ #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
++#if !defined(__sun)
+ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
++#endif
+ #define _GNU_SOURCE
+ #include <time.h>
+ #include "cache.h"