From 9b9babd2d725261266050f7d23297b71a01cc593 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Thu, 26 Apr 2007 01:23:48 +0000 Subject: Get this to build under NetBSD-2/alpha and install under SunOS-5.9/sparc. As part of this, the correct install program is now used, the tar specified by pkgsrc is used, added a missing tar to tools, stopped hardcoding the c-compiler, and added a missing wish:run to the tools. Whew! --- devel/scmgit/Makefile | 6 ++++-- devel/scmgit/distinfo | 17 ++++++++++++++-- devel/scmgit/patches/patch-aa | 45 ++++++++++++++++++++++++++++++++++++++----- devel/scmgit/patches/patch-ad | 28 +++++++++++++++++++++++++++ devel/scmgit/patches/patch-af | 18 +++++++++++++++++ devel/scmgit/patches/patch-ag | 12 ++++++++++++ devel/scmgit/patches/patch-ah | 15 +++++++++++++++ 7 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 devel/scmgit/patches/patch-ad create mode 100644 devel/scmgit/patches/patch-af create mode 100644 devel/scmgit/patches/patch-ag create mode 100644 devel/scmgit/patches/patch-ah (limited to 'devel/scmgit') diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile index e3a9f5d5804..3c2852d89f9 100644 --- a/devel/scmgit/Makefile +++ b/devel/scmgit/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2007/04/21 10:36:58 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/04/26 01:23:48 dmcmahill Exp $ # DISTNAME= git-1.5.1.1 PKGNAME= scm${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel scm MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -17,13 +18,14 @@ 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 +USE_TOOLS+= gmake perl:run sh:run wish:run tar EXTRACT_USING= gtar MAKE_ENV+= CURLDIR=${BUILDLINK_PREFIX.curl:Q} MAKE_ENV+= PERL_PATH=${PERL5:Q} MAKE_ENV+= PYTHON_PATH=${PYTHONBIN:Q} MAKE_ENV+= SHELL_PATH=${SH:Q} +MAKE_ENV+= TAR=${TAR:Q} BUILD_TARGET= all doc INSTALL_TARGET= install install-doc MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo index acc6108e3f4..207fb6e53c3 100644 --- a/devel/scmgit/distinfo +++ b/devel/scmgit/distinfo @@ -1,9 +1,22 @@ -$NetBSD: distinfo,v 1.8 2007/04/15 21:46:41 wiz Exp $ +$NetBSD: distinfo,v 1.9 2007/04/26 01:23:48 dmcmahill Exp $ +<<<<<<< distinfo +SHA1 (git-1.5.0.3.tar.gz) = a5efd2cd36daad60718ed9b1f5a4f0de1eade25c +RMD160 (git-1.5.0.3.tar.gz) = 2af313d5414770abad82babd0b4aee9b7e0bbc5b +Size (git-1.5.0.3.tar.gz) = 1245187 bytes +======= SHA1 (git-1.5.1.1.tar.gz) = 6d0607e125e8466e85af411fde894ee7ef96098d RMD160 (git-1.5.1.1.tar.gz) = efbc8e5b49831561915f2b674efca5a6c5ffc6a2 Size (git-1.5.1.1.tar.gz) = 1322959 bytes -SHA1 (patch-aa) = 88f6e964616d45c3141c1afb5b465e40afc927f8 +>>>>>>> 1.8 +<<<<<<< distinfo +======= +>>>>>>> 1.8 +SHA1 (patch-aa) = 3341fce439889b78c244cc48cf6c1f2ef3578a75 SHA1 (patch-ab) = 59aaf91ef1f0d5a9ded006157467d8bd12d7b87b SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc +SHA1 (patch-ad) = 6be56a65b692d16dfce45b167d2a0858ca9064cd SHA1 (patch-ae) = d267e41f5f883bde801728328c67fd733d3bd351 +SHA1 (patch-af) = d5cceb813a2e222116e220182e92eef75f40f8a4 +SHA1 (patch-ag) = 6f4e3c0418286c0ca3fbc00a72a90e59983cb6bc +SHA1 (patch-ah) = 6de6fcc23f919a1278f90788f8e12f532bc0a5e3 diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa index 42164c4db3d..5e0833952b1 100644 --- a/devel/scmgit/patches/patch-aa +++ b/devel/scmgit/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2007/04/15 21:46:41 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2007/04/26 01:23:49 dmcmahill Exp $ NetBSD 3.0 needs -liconv, too. -CFLAGS, LDFLAGS and LIBS should be taken from the environment. +AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment. --- Makefile.orig 2007-04-12 01:41:44.000000000 +0000 +++ Makefile @@ -15,7 +15,18 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment. ALL_CFLAGS = $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) STRIP ?= strip -@@ -360,6 +358,7 @@ ifeq ($(uname_S),Darwin) +@@ -154,10 +152,6 @@ GITWEB_SITE_FOOTER = + + export prefix bindir gitexecdir template_dir + +-CC = gcc +-AR = ar +-TAR = tar +-INSTALL = install + RPMBUILD = rpmbuild + + # sparse is architecture-neutral, which means that we need to tell it +@@ -360,6 +354,7 @@ ifeq ($(uname_S),Darwin) NO_STRLCPY = YesPlease endif ifeq ($(uname_S),SunOS) @@ -23,7 +34,16 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment. NEEDS_SOCKET = YesPlease NEEDS_NSL = YesPlease SHELL_PATH = /bin/bash -@@ -408,9 +407,7 @@ ifeq ($(uname_S),OpenBSD) +@@ -377,8 +372,6 @@ ifeq ($(uname_S),SunOS) + NO_C99_FORMAT = YesPlease + NO_STRTOUMAX = YesPlease + endif +- INSTALL = ginstall +- TAR = gtar + BASIC_CFLAGS += -D__EXTENSIONS__ + endif + ifeq ($(uname_O),Cygwin) +@@ -408,9 +401,7 @@ ifeq ($(uname_S),OpenBSD) BASIC_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),NetBSD) @@ -34,7 +54,7 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment. BASIC_CFLAGS += -I/usr/pkg/include BASIC_LDFLAGS += -L/usr/pkg/lib ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib -@@ -648,7 +645,7 @@ prefix_SQ = $(subst ','\'',$(prefix)) +@@ -648,7 +639,7 @@ prefix_SQ = $(subst ','\'',$(prefix)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) @@ -43,3 +63,18 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment. BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS) +@@ -890,10 +881,10 @@ check: common-cmds.h + ### Installation rules + + install: all +- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)' +- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' +- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' +- $(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)' ++ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)' ++ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)' ++ $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' ++ $(BSD_INSTALL_SCRIPT) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)' + $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install + $(MAKE) -C perl prefix='$(prefix_SQ)' install + $(MAKE) -C git-gui install diff --git a/devel/scmgit/patches/patch-ad b/devel/scmgit/patches/patch-ad new file mode 100644 index 00000000000..90d221d67d5 --- /dev/null +++ b/devel/scmgit/patches/patch-ad @@ -0,0 +1,28 @@ +$NetBSD: patch-ad,v 1.3 2007/04/26 01:23:49 dmcmahill Exp $ + +Avoid conflicting with the wcwidth which exists in libc but +with a different prototype: + +utf8.c:66: error: conflicting types for `wcwidth' +/usr/include/wchar.h:146: error: previous declaration of `wcwidth' + +--- utf8.c.orig 2007-03-05 02:15:33.000000000 +0000 ++++ utf8.c +@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, cons + * in ISO 10646. + */ + +-static int wcwidth(ucs_char_t ch) ++static int git_wcwidth(ucs_char_t ch) + { + /* + * Sorted list of non-overlapping intervals of non-spacing characters, +@@ -207,7 +207,7 @@ invalid: + return 0; + } + +- return wcwidth(ch); ++ return git_wcwidth(ch); + } + + int is_utf8(const char *text) diff --git a/devel/scmgit/patches/patch-af b/devel/scmgit/patches/patch-af new file mode 100644 index 00000000000..14d641df5d0 --- /dev/null +++ b/devel/scmgit/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $ + +--- Documentation/Makefile.orig 2007-03-05 02:15:33.000000000 +0000 ++++ Documentation/Makefile +@@ -59,9 +59,10 @@ man1: $(DOC_MAN1) + man7: $(DOC_MAN7) + + install: man +- $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) +- $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) +- $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) ++ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) ++ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir) ++ $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir) ++ $(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir) + + + # diff --git a/devel/scmgit/patches/patch-ag b/devel/scmgit/patches/patch-ag new file mode 100644 index 00000000000..cf9d1620f35 --- /dev/null +++ b/devel/scmgit/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $ + +--- templates/Makefile.orig 2007-03-05 02:15:33.000000000 +0000 ++++ templates/Makefile +@@ -41,6 +41,6 @@ clean: + rm -rf blt boilerplates.made + + install: all +- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)' ++ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_dir_SQ)' + (cd blt && $(TAR) cf - .) | \ + (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -) diff --git a/devel/scmgit/patches/patch-ah b/devel/scmgit/patches/patch-ah new file mode 100644 index 00000000000..363a202fc4b --- /dev/null +++ b/devel/scmgit/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $ + +--- git-gui/Makefile.orig 2007-04-12 01:41:44.000000000 +0000 ++++ git-gui/Makefile +@@ -54,8 +54,8 @@ $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VER + all:: $(ALL_PROGRAMS) + + install: all +- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' +- $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' ++ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)' ++ $(BSD_INSTALL_SCRIPT) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) + + dist-version: -- cgit v1.2.3