summaryrefslogtreecommitdiff
path: root/devel/scmgit-base
diff options
context:
space:
mode:
Diffstat (limited to 'devel/scmgit-base')
-rw-r--r--devel/scmgit-base/Makefile33
-rw-r--r--devel/scmgit-base/PLIST22
-rw-r--r--devel/scmgit-base/distinfo11
-rw-r--r--devel/scmgit-base/options.mk16
-rw-r--r--devel/scmgit-base/patches/patch-aa60
-rw-r--r--devel/scmgit-base/patches/patch-ab15
6 files changed, 60 insertions, 97 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ed9743711a4..be43d806d7a 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/02/22 09:20:30 obache Exp $
+# $NetBSD: Makefile,v 1.24 2010/04/28 22:01:43 morr Exp $
#
.include "../../devel/scmgit/Makefile.common"
@@ -15,22 +15,21 @@ DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
USE_LANGUAGES= c99
USE_TOOLS+= perl:run sh:run msgfmt
-CFLAGS.NetBSD+= -D_NETBSD_SOURCE
-
-CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl:Q}
-CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat:Q}
-CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv:Q}
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib:Q}
-
-BUILD_TARGET= all
-INSTALL_TARGET= install
-
PERL5_CONFIGURE= no
PERL5_PACKLIST= auto/Git/.packlist
REPLACE_PERL+= *.perl */*.perl */*/*.perl
REPLACE_PERL+= contrib/hooks/update-paranoid
+CFLAGS.NetBSD+= -D_NETBSD_SOURCE
+
+CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl}
+CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
+CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
+CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
+
+BUILD_TARGET= all
+
REPLACE_SH+= contrib/hooks/post-receive-email
REPLACE_SH+= contrib/hooks/pre-auto-gc-battery
@@ -62,11 +61,13 @@ REQD_FILES+= ${GIT_TEMPLATES:@.t.@\
@:M*}
-CONFIGURE_ENV+= HOME=${PREFIX:Q}
-CONFIGURE_ENV+= gitexecdir=${GITCOREDIR:Q}
+CONFIGURE_ENV+= HOME=${PREFIX}
+CONFIGURE_ENV+= gitexecdir=${GITCOREDIR}
+
+MAKE_FLAGS+= INSTALL=${INSTALL:Q}
GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR}
-MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR:Q}
+MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
SUBST_CLASSES+= fix-paths
@@ -89,10 +90,10 @@ SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g"
#.include "../../editors/emacs/modules.mk" # XXX TODO (see patch-ad)
.include "options.mk"
-.include "../../lang/perl5/module.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 3a6fb3ed6c8..0cb74f480ee 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2010/03/20 13:55:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/04/28 22:01:43 morr Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@@ -6,6 +6,16 @@ bin/git-shell
bin/git-upload-archive
bin/git-upload-pack
${PLIST.gui}bin/gitk
+${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
+lib/perl5/vendor_perl/man/man3/Git.3
+${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/util.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/util.pyc
libexec/git-core/git
libexec/git-core/git-add
libexec/git-core/git-add--interactive
@@ -112,7 +122,10 @@ libexec/git-core/git-receive-pack
libexec/git-core/git-reflog
libexec/git-core/git-relink
libexec/git-core/git-remote
-libexec/git-core/git-remote-curl
+libexec/git-core/git-remote-ftp
+libexec/git-core/git-remote-ftps
+libexec/git-core/git-remote-http
+libexec/git-core/git-remote-https
libexec/git-core/git-repack
libexec/git-core/git-replace
libexec/git-core/git-repo-config
@@ -146,8 +159,8 @@ libexec/git-core/git-unpack-objects
libexec/git-core/git-update-index
libexec/git-core/git-update-ref
libexec/git-core/git-update-server-info
-libexec/git-core/git-upload-pack
libexec/git-core/git-upload-archive
+libexec/git-core/git-upload-pack
libexec/git-core/git-var
libexec/git-core/git-verify-pack
libexec/git-core/git-verify-tag
@@ -216,6 +229,7 @@ ${PLIST.gui}share/git-gui/lib/spellcheck.tcl
${PLIST.gui}share/git-gui/lib/sshkey.tcl
${PLIST.gui}share/git-gui/lib/status_bar.tcl
${PLIST.gui}share/git-gui/lib/tclIndex
+${PLIST.gui}share/git-gui/lib/themed.tcl
${PLIST.gui}share/git-gui/lib/tools.tcl
${PLIST.gui}share/git-gui/lib/tools_dlg.tcl
${PLIST.gui}share/git-gui/lib/transport.tcl
@@ -223,6 +237,8 @@ ${PLIST.gui}share/git-gui/lib/win32.tcl
${PLIST.gui}share/git-gui/lib/win32_shortcut.js
${PLIST.gui}share/gitk/lib/msgs/de.msg
${PLIST.gui}share/gitk/lib/msgs/es.msg
+${PLIST.gui}share/gitk/lib/msgs/fr.msg
+${PLIST.gui}share/gitk/lib/msgs/hu.msg
${PLIST.gui}share/gitk/lib/msgs/it.msg
${PLIST.gui}share/gitk/lib/msgs/ja.msg
${PLIST.gui}share/gitk/lib/msgs/ru.msg
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index ba1b47bab97..86f09772562 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2010/04/04 08:12:02 obache Exp $
+$NetBSD: distinfo,v 1.26 2010/04/28 22:01:43 morr Exp $
-SHA1 (git-1.6.6.2.tar.gz) = 13b339a55982162753d414731ff1b28791800209
-RMD160 (git-1.6.6.2.tar.gz) = f0b465000a5b5deee156dda6c87ef3e2c744b226
-Size (git-1.6.6.2.tar.gz) = 2841821 bytes
-SHA1 (patch-aa) = be3164a456d548bb722456ce97e8ba8bbb5620e2
-SHA1 (patch-ab) = 838642e425b55ae08a3ff05bd8b03b8cc79d9820
+SHA1 (git-1.7.0.5.tar.gz) = 3ac6cd9971c6682df12442ba2b5f79e54311583a
+RMD160 (git-1.7.0.5.tar.gz) = 6b2e294fa3d327ed0e0c61fb7532e75f35fcc4f4
+Size (git-1.7.0.5.tar.gz) = 2951641 bytes
+SHA1 (patch-aa) = 8356e00a82567ecad200b61daa91a453755407dd
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk
index 37380cd13cc..f60aec4d2d7 100644
--- a/devel/scmgit-base/options.mk
+++ b/devel/scmgit-base/options.mk
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.2 2008/08/01 11:30:20 minskim Exp $
+# $NetBSD: options.mk,v 1.3 2010/04/28 22:01:43 morr Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.scmgit
-PKG_SUPPORTED_OPTIONS= scmgit-gui
-PKG_SUGGESTED_OPTIONS= scmgit-gui
+PKG_SUPPORTED_OPTIONS= scmgit-gui python
+PKG_SUGGESTED_OPTIONS= scmgit-gui python
.include "../../mk/bsd.options.mk"
PLIST_VARS+= gui
PLIST_VARS+= macosx
+PLIST_VARS+= python
.if !empty(PKG_OPTIONS:Mscmgit-gui)
PLIST.gui= yes
@@ -20,3 +21,12 @@ PRIVILEGED_STAGES+= clean
.else
CONFIGURE_ARGS+= --without-tcltk
.endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+PY_PATCHPLIST= yes
+MAKE_FLAGS+= PYTHON_PATH=${PYTHONBIN}
+PLIST.python= yes
+.include "../../lang/python/extension.mk"
+.else
+CONFIGURE_ARGS+= --without-python
+.endif
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index d31143d21b7..ccaf7debf71 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2010/04/28 22:01:43 morr Exp $
---- Makefile.orig 2009-12-24 00:00:22.000000000 +0000
-+++ Makefile
-@@ -305,12 +305,8 @@ GITWEB_SITE_FOOTER =
+--- Makefile.orig 2010-04-12 19:23:36.000000000 +0400
++++ Makefile 2010-04-16 14:07:10.000000000 +0400
+@@ -277,12 +277,8 @@
export prefix bindir sharedir sysconfdir
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
-@@ -768,9 +764,10 @@ ifeq ($(uname_S),Darwin)
+@@ -762,9 +758,10 @@
USE_ST_TIMESPEC = YesPlease
endif
ifeq ($(uname_S),SunOS)
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
-@@ -801,8 +798,6 @@ ifeq ($(uname_S),SunOS)
+@@ -793,8 +790,6 @@
NO_C99_FORMAT = YesPlease
NO_STRTOUMAX = YesPlease
endif
@@ -36,51 +36,3 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
endif
ifeq ($(uname_O),Cygwin)
-@@ -850,15 +845,20 @@ ifeq ($(uname_S),OpenBSD)
- THREADED_DELTA_SEARCH = YesPlease
- 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 $(CC_LD_DYNPATH)/usr/pkg/lib
- THREADED_DELTA_SEARCH = YesPlease
- USE_ST_TIMESPEC = YesPlease
- NO_MKSTEMPS = YesPlease
- endif
-+ifeq ($(uname_S),DragonFly)
-+ NEEDS_LIBICONV = YesPlease
-+ BASIC_CFLAGS += -I/usr/pkg/include
-+ BASIC_LDFLAGS += -L/usr/pkg/lib
-+ USE_ST_TIMESPEC = YesPlease
-+ THREADED_DELTA_SEARCH = YesPlease
-+endif
- ifeq ($(uname_S),AIX)
- NO_STRCASESTR=YesPlease
- NO_MEMMEM = YesPlease
-@@ -1395,7 +1395,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)' \
- $(COMPAT_CFLAGS)
-@@ -1788,10 +1788,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
- export gitexec_instdir
-
- install: all
-- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
-- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-- $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
-+ $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
-+ $(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-+ $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-+ $(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
- $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
- ifndef NO_PERL
- $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
deleted file mode 100644
index 03293a7828a..00000000000
--- a/devel/scmgit-base/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2010/03/31 00:44:40 gdt Exp $
-
-Patch from http://article.gmane.org/gmane.comp.version-control.git/143453
-
---- compat/bswap.h.orig 2009-12-24 00:00:22.000000000 +0000
-+++ compat/bswap.h
-@@ -17,6 +17,8 @@ static inline uint32_t default_swab32(ui
- ((val & 0x000000ff) << 24));
- }
-
-+#undef bswap32
-+
- #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-
- #define bswap32(x) ({ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 13:05:02 +0000