Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jan 2014 02:40:18 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340982 - in head/shells/fish: . files
Message-ID:  <201401250240.s0P2eIZh065119@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Sat Jan 25 02:40:17 2014
New Revision: 340982
URL: http://svnweb.freebsd.org/changeset/ports/340982
QAT: https://qat.redports.org/buildarchive/r340982/

Log:
  - Add licenses (GPLv2)
  - Fix DOCS Option, add extra-patch-Makefile.in
  
  Reviewed by:	horia

Added:
  head/shells/fish/files/
  head/shells/fish/files/extra-patch-Makefile.in   (contents, props changed)
Modified:
  head/shells/fish/Makefile

Modified: head/shells/fish/Makefile
==============================================================================
--- head/shells/fish/Makefile	Sat Jan 25 02:24:39 2014	(r340981)
+++ head/shells/fish/Makefile	Sat Jan 25 02:40:17 2014	(r340982)
@@ -9,6 +9,8 @@ MASTER_SITES=	http://fishshell.com/files
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	User friendly command line shell
 
+LICENSE=	GPLv2
+
 USES=		gmake iconv
 USE_AUTOTOOLS=	autoconf
 
@@ -24,6 +26,8 @@ NLS_USES=		gettext
 NLS_CONFIGURE_ENV=	ac_cv_func_gettext=yes
 NLS_CONFIGURE_OFF=	--without-gettext
 
+.include <bsd.port.options.mk> 
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^all:/s|user_doc|| ; \
@@ -37,6 +41,10 @@ post-patch:
 		 s|ncurses curses|curses| ; \
 		 s|ncurses.h||' ${WRKSRC}/configure.ac
 
+.if ! ${PORT_OPTIONS:MDOCS}
+EXTRA_PATCHES+=${FILESDIR}/extra-patch-Makefile.in
+.endif
+
 post-install:
 .for i in fish fish_indent fish_pager fishd mimedb
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}

Added: head/shells/fish/files/extra-patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/shells/fish/files/extra-patch-Makefile.in	Sat Jan 25 02:40:17 2014	(r340982)
@@ -0,0 +1,21 @@
+--- ./Makefile.in.orig	2013-10-19 22:10:26.000000000 +0200
++++ ./Makefile.in	2014-01-25 02:35:57.000000000 +0100
+@@ -639,12 +639,12 @@
+ 		true; \
+ 	done;
+ 
+-	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
+-	for i in user_doc/html/* ChangeLog; do \
+-		if test -f $$i; then \
+-			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+-		fi; \
+-	done;
++#	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
++#	for i in user_doc/html/* ChangeLog; do \
++#		if test -f $$i; then \
++#			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
++#		fi; \
++#	done;
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+ 	for i in $(MANUALS); do \
+ 		$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401250240.s0P2eIZh065119>