From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 30 18:13:33 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8A46C7E;
 Mon, 30 Jun 2014 18:13:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B9E82493;
 Mon, 30 Jun 2014 18:13:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5UIDXj8039252;
 Mon, 30 Jun 2014 18:13:33 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5UIDXXH039248;
 Mon, 30 Jun 2014 18:13:33 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201406301813.s5UIDXXH039248@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 30 Jun 2014 18:13:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359896 - head/databases/bbdb
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jun 2014 18:13:33 -0000

Author: antoine
Date: Mon Jun 30 18:13:32 2014
New Revision: 359896
URL: http://svnweb.freebsd.org/changeset/ports/359896
QAT: https://qat.redports.org/buildarchive/r359896/

Log:
  Allow package installation in a world WITHOUT_INFO

Modified:
  head/databases/bbdb/Makefile
  head/databases/bbdb/pkg-plist

Modified: head/databases/bbdb/Makefile
==============================================================================
--- head/databases/bbdb/Makefile	Mon Jun 30 18:13:11 2014	(r359895)
+++ head/databases/bbdb/Makefile	Mon Jun 30 18:13:32 2014	(r359896)
@@ -17,10 +17,7 @@ USES=		makeinfo
 ALL_TARGET=	bbdb info
 MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"makeinfo --no-split\""
 BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-DIRSECTION=	"The Emacs editor and associated tools"
-INFOENTRY=	"* BBDB: (bbdb).             The Insidious Big Brother Database."
-PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR} \
-		DIRSECTION=${DIRSECTION} INFOENTRY=${INFOENTRY}
+PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
@@ -28,12 +25,15 @@ CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+INFO=	bbdb
+.endif
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_DATA} ${WRKSRC}/texinfo/bbdb.info ${STAGEDIR}${PREFIX}/info
-	install-info --section=${DIRSECTION} --entry=${INFOENTRY} ${STAGEDIR}${PREFIX}/info/bbdb.info ${STAGEDIR}${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.mk>

Modified: head/databases/bbdb/pkg-plist
==============================================================================
--- head/databases/bbdb/pkg-plist	Mon Jun 30 18:13:11 2014	(r359895)
+++ head/databases/bbdb/pkg-plist	Mon Jun 30 18:13:32 2014	(r359896)
@@ -32,6 +32,3 @@
 %%BBDB_LISPDIR%%/bbdb-xemacs.el
 %%BBDB_LISPDIR%%/bbdb-xemacs.elc
 @dirrm %%BBDB_LISPDIR%%
-%%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/bbdb.info %D/info/dir
-%%PORTDOCS%%info/bbdb.info
-%%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/bbdb.info %D/info/dir