Import of pkgsrc-2013Q2

devel/stgit/patches/patch-aa

@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2008/01/10 06:35:49 bjs Exp $
+
+--- contrib/stg-gitk.orig	2007-12-11 18:54:04.000000000 -0500
++++ contrib/stg-gitk
+@@ -48,10 +48,10 @@ if [ $allbranches = 1 ]; then
+     refdirs="$GIT_DIR/refs"
+ else
+     # default to current branch
+-    if [ "$branches" == "" ]; then
++    if [ "$branches" = "" ]; then
+ 	branches="$(stg branch)"
+     fi
+-    if [ "$branches" == "" ]; then
++    if [ "$branches" = "" ]; then
+ 	echo >&2 "ERROR: cannot find current branch."
+ 	exit 1
+     fi

devel/stgit/patches/patch-ab

@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.2 2008/04/10 12:11:34 bjs Exp $
+
+--- setup.py.orig	2008-03-24 15:21:30.000000000 -0400
++++ setup.py
+@@ -62,10 +62,8 @@ setup(name = 'stgit',
+       scripts = ['stg'],
+       packages = ['stgit', 'stgit.commands'],
+       data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
+-                    ('share/stgit/examples', glob.glob('examples/*.tmpl')),
+-                    ('share/stgit/examples', ['examples/gitconfig']),
+-                    ('share/stgit/contrib', ['contrib/diffcol.sh',
+-                                             'contrib/stgbashprompt.sh',
++                    ('share/examples/stgit', ['examples/gitconfig']),
++                    ('share/stgit/contrib', ['contrib/stgbashprompt.sh',
+                                              'contrib/stgit-completion.bash']),
+                     ('share/doc/stgit', glob.glob('doc/*.txt'))]
+       )

devel/stgit/patches/patch-ac

@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.2 2008/07/25 04:00:59 bjs Exp $
+
+--- Documentation/Makefile.orig	2007-07-25 19:49:46.000000000 -0400
++++ Documentation/Makefile	2008-02-11 14:55:30.000000000 -0500
+@@ -20,7 +20,7 @@
+ # DESTDIR=
+ 
+ ASCIIDOC=asciidoc --unsafe
+-ASCIIDOC_EXTRA =
++#ASCIIDOC_EXTRA =
+ INSTALL?=install
+ 
+ #
+@@ -44,9 +44,14 @@
+ 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)
++	for fn in $(DOC_MAN1); do \
++	$(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(man1dir); \
++	done
++	for fn in $(DOC_MAN7); do \
++	$(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(man7dir); \
++	done
+ #
+ # Determine "include::" file references in asciidoc files.
+ #

devel/stgit/patches/patch-ad

@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2011/01/21 13:09:51 dmcmahill Exp $
+
+Remove level 0 markup which is not allowed for an 'article' document.
+
+--- Documentation/tutorial.txt.orig	2011-01-21 12:56:56.000000000 +0000
++++ Documentation/tutorial.txt	2011-01-21 12:57:06.000000000 +0000
+@@ -1,4 +1,4 @@
+ StGIT Tutorial
+-##############
++===============
+ 
+