diff options
Diffstat (limited to 'devel/scmgit-base/patches/patch-aa')
| -rw-r--r-- | devel/scmgit-base/patches/patch-aa | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa new file mode 100644 index 00000000000..8f0e2cb6be3 --- /dev/null +++ b/devel/scmgit-base/patches/patch-aa @@ -0,0 +1,91 @@ +$NetBSD: patch-aa,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $ + +NetBSD 3.0 needs -liconv, too. + +AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment. + +--- Makefile.orig 2007-12-01 16:21:12.000000000 -0500 ++++ Makefile +@@ -139,8 +139,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 +@@ -177,12 +175,8 @@ GITWEB_SITE_FOOTER = + + export prefix bindir gitexecdir sharedir template_dir sysconfdir + +-CC = gcc +-AR = ar + RM = rm -f +-TAR = tar + FIND = find +-INSTALL = install + RPMBUILD = rpmbuild + TCL_PATH = tclsh + TCLTK_PATH = wish +@@ -402,9 +396,10 @@ ifeq ($(uname_S),Darwin) + NO_STRLCPY = YesPlease + endif + ifeq ($(uname_S),SunOS) ++ NEEDS_LIBICONV = YesPlease + NEEDS_SOCKET = YesPlease + NEEDS_NSL = YesPlease +- SHELL_PATH = /bin/bash ++ SHELL_PATH = ${BASH} + NO_STRCASESTR = YesPlease + NO_HSTRERROR = YesPlease + ifeq ($(uname_R),5.8) +@@ -420,8 +415,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) +@@ -451,9 +444,7 @@ ifeq ($(uname_S),OpenBSD) + BASIC_LDFLAGS += -L/usr/local/lib + endif + ifeq ($(uname_S),NetBSD) +- ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) +- NEEDS_LIBICONV = YesPlease +- endif ++ NEEDS_LIBICONV = YesPlease + BASIC_CFLAGS += -I/usr/pkg/include + BASIC_LDFLAGS += -L/usr/pkg/lib + ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib +@@ -718,7 +709,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P + PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) + TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) + +-LIBS = $(GITLIBS) $(EXTLIBS) ++LIBS += $(GITLIBS) $(EXTLIBS) + + BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ + -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS) +@@ -991,14 +982,14 @@ remove-dashes: + ### 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 '$(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 '$(DESTDIR_SQ)$(bindir_SQ)' + $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install + $(MAKE) -C perl prefix='$(prefix_SQ)' install + ifndef NO_TCLTK +- $(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk ++ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk + $(MAKE) -C git-gui install + endif + if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ |