[Midnightbsd-cvs] mports [17756] trunk/devel/git: turn off validation

[laffer1 at midnightbsd.org]

Revision: 17756
          http://svnweb.midnightbsd.org/mports/?rev=17756
Author:   laffer1
Date:     2014-10-14 22:15:47 -0400 (Tue, 14 Oct 2014)
Log Message:
-----------
turn off validation

Modified Paths:
--------------
    trunk/devel/git/Makefile
    trunk/devel/git/files/patch-Documentation__Makefile
    trunk/devel/git/pkg-plist

Added Paths:
-----------
    trunk/devel/git/files/patch-subtree-Makefile

Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile	2014-10-15 01:48:46 UTC (rev 17755)
+++ trunk/devel/git/Makefile	2014-10-15 02:15:47 UTC (rev 17756)
@@ -28,7 +28,7 @@
 USES=		gmake shebangfix
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	V=1
+MAKE_ENV+=	V=1 XMLTO_EXTRA=--skip-validation 
 USE_OPENSSL=	yes
 USE_RC_SUBR=	git_daemon
 SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
@@ -244,18 +244,13 @@
 		${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
 .if ${PORT_OPTIONS:MCONTRIB}
 	@${ECHO_MSG} "===> Installing contributed scripts"
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
-	${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
-	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
+	${MKDIR} ${PREFIX}/share/git-core/contrib
+	${CP} -R ${WRKSRC}/contrib/* ${PREFIX}/share/git-core/contrib
+	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} XMLTO=--skip-validation \
+		${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${FAKE_MAKEARGS} install install-doc
 .endif
 .if ${PORT_OPTIONS:MP4}
-	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${PREFIX}/bin/
 .endif
 
-post-stage:
-.if ${PORT_OPTIONS:MPERL}
-	${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-.endif
-
 .include <bsd.port.mk>

Modified: trunk/devel/git/files/patch-Documentation__Makefile
===================================================================
--- trunk/devel/git/files/patch-Documentation__Makefile	2014-10-15 01:48:46 UTC (rev 17755)
+++ trunk/devel/git/files/patch-Documentation__Makefile	2014-10-15 02:15:47 UTC (rev 17756)
@@ -1,6 +1,6 @@
---- ./Documentation/Makefile.orig	2013-08-27 12:08:25.000000000 -0400
-+++ ./Documentation/Makefile	2013-08-27 12:09:18.000000000 -0400
-@@ -83,11 +83,11 @@
+--- Documentation/Makefile.orig	2014-08-15 18:26:55.000000000 -0400
++++ Documentation/Makefile	2014-10-14 21:59:23.000000000 -0400
+@@ -84,11 +84,11 @@
  DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
  DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
  
@@ -15,7 +15,7 @@
  mandir ?= $(prefix)/share/man
  man1dir = $(mandir)/man1
  man5dir = $(mandir)/man5
-@@ -202,7 +202,7 @@
+@@ -203,7 +203,7 @@
  endif
  endif
  
@@ -24,3 +24,33 @@
  
  html: $(DOC_HTML)
  
+@@ -304,13 +304,13 @@
+ 
+ $(MAN_HTML): %.html : %.txt asciidoc.conf
+ 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+-	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
++	$(ASCIIDOC) --skip-validation -b xhtml11 -d manpage -f asciidoc.conf \
+ 		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
+ 	mv $@+ $@
+ 
+ $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
+ 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+-	$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
++	$(ASCIIDOC) --skip-validation -b xhtml11 -f asciidoc.conf \
+ 		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
+ 	mv $@+ $@
+ 
+@@ -319,11 +319,11 @@
+ 
+ %.1 %.5 %.7 : %.xml manpage-base-url.xsl
+ 	$(QUIET_XMLTO)$(RM) $@ && \
+-	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
++	$(XMLTO) --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+ 
+ %.xml : %.txt asciidoc.conf
+ 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+-	$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
++	$(ASCIIDOC) --skip-validation -b docbook -d manpage -f asciidoc.conf \
+ 		$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
+ 	mv $@+ $@
+ 

Added: trunk/devel/git/files/patch-subtree-Makefile
===================================================================
--- trunk/devel/git/files/patch-subtree-Makefile	                        (rev 0)
+++ trunk/devel/git/files/patch-subtree-Makefile	2014-10-15 02:15:47 UTC (rev 17756)
@@ -0,0 +1,11 @@
+--- contrib/subtree/Makefile.orig	2014-10-14 22:09:29.000000000 -0400
++++ contrib/subtree/Makefile	2014-10-14 22:09:43.000000000 -0400
+@@ -53,7 +53,7 @@
+ 	$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
+ 
+ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
+-	$(XMLTO) -m $(MANPAGE_XSL) man $^
++	$(XMLTO) --skip-validation -m $(MANPAGE_XSL) man $^
+ 
+ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
+ 	$(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \


Property changes on: trunk/devel/git/files/patch-subtree-Makefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist	2014-10-15 01:48:46 UTC (rev 17755)
+++ trunk/devel/git/pkg-plist	2014-10-15 02:15:47 UTC (rev 17756)
@@ -369,7 +369,6 @@
 libexec/git-core/mergetools/araxis
 %%GUI%%bin/gitk
 %%PERLSUB%%%%SITE_PERL%%/Git.pm
-%%PERLSUB%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
 %%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/SVN.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/IndexInfo.pm