From owner-svn-ports-head@FreeBSD.ORG Sun Jun 29 15:47:53 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60BCBE6B; Sun, 29 Jun 2014 15:47:53 +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 4D8BC2313; Sun, 29 Jun 2014 15:47:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5TFlr8H090089; Sun, 29 Jun 2014 15:47:53 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5TFlq2V090082; Sun, 29 Jun 2014 15:47:52 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201406291547.s5TFlq2V090082@svn.freebsd.org> From: Antoine Brodin Date: Sun, 29 Jun 2014 15:47:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359776 - in head/editors: flim semi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2014 15:47:53 -0000 Author: antoine Date: Sun Jun 29 15:47:52 2014 New Revision: 359776 URL: http://svnweb.freebsd.org/changeset/ports/359776 QAT: https://qat.redports.org/buildarchive/r359776/ Log: Fix package installation in a world WITHOUT_INFO Modified: head/editors/flim/Makefile head/editors/flim/pkg-plist.emacs21 head/editors/semi/Makefile head/editors/semi/pkg-plist.emacs20 Modified: head/editors/flim/Makefile ============================================================================== --- head/editors/flim/Makefile Sun Jun 29 15:28:25 2014 (r359775) +++ head/editors/flim/Makefile Sun Jun 29 15:47:52 2014 (r359776) @@ -83,6 +83,13 @@ MAKEINFO= makeinfo --no-split --no-vali MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer +.if ! defined(EMACS_PACKAGESDIR) || ! defined(MANIFEST) +INFO= mime-en +.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES") +INFO+= mime-ja +.endif +.endif + .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME) pre-build: pkg-el-copy .endif @@ -172,13 +179,11 @@ info-install: @(cd ${WRKSRC} ; \ for i in mime-en.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \ - install-info ${STAGEDIR}${LOCALBASE}/info/$${i} ${STAGEDIR}${LOCALBASE}/info/dir ; \ done) .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ for i in mime-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \ - install-info ${STAGEDIR}${LOCALBASE}/info/$${i} ${STAGEDIR}${LOCALBASE}/info/dir ; \ done) .endif Modified: head/editors/flim/pkg-plist.emacs21 ============================================================================== --- head/editors/flim/pkg-plist.emacs21 Sun Jun 29 15:28:25 2014 (r359775) +++ head/editors/flim/pkg-plist.emacs21 Sun Jun 29 15:47:52 2014 (r359776) @@ -77,11 +77,5 @@ %%PORTDOCS%%%%FLIMDOCDIR%%/README.ja %%PORTDOCS%%%%FLIMDOCDIR%%/VERSION %%PORTDOCS%%@dirrm %%FLIMDOCDIR%% -@unexec install-info --delete %D/info/mime-en.info %D/info/dir -info/mime-en.info -@exec install-info %D/info/mime-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ja.info %D/info/dir -info/mime-ja.info -@exec install-info %D/info/mime-ja.info %D/info/dir share/flim/%%FLIM_COOKIE%% @dirrmtry share/flim Modified: head/editors/semi/Makefile ============================================================================== --- head/editors/semi/Makefile Sun Jun 29 15:28:25 2014 (r359775) +++ head/editors/semi/Makefile Sun Jun 29 15:47:52 2014 (r359776) @@ -76,6 +76,13 @@ MAKEINFO= makeinfo --no-split --no-vali MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer +.if ! defined(EMACS_PACKAGESDIR) || ! defined(MANIFEST) +INFO= mime-ui-en +.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES") +INFO+= mime-ui-ja +.endif +.endif + pre-build: .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME) @${MAKE} -C ${.CURDIR} pkg-el-copy @@ -169,13 +176,11 @@ info-install: @(cd ${WRKSRC} ; \ for i in mime-ui-en.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \ - install-info ${STAGEDIR}${LOCALBASE}/info/$${i} ${STAGEDIR}${LOCALBASE}/info/dir ; \ done) .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES") @(cd ${WRKSRC} ; \ for i in mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \ - install-info ${STAGEDIR}${LOCALBASE}/info/$${i} ${STAGEDIR}${LOCALBASE}/info/dir ; \ done) .endif Modified: head/editors/semi/pkg-plist.emacs20 ============================================================================== --- head/editors/semi/pkg-plist.emacs20 Sun Jun 29 15:28:25 2014 (r359775) +++ head/editors/semi/pkg-plist.emacs20 Sun Jun 29 15:47:52 2014 (r359776) @@ -48,11 +48,5 @@ %%PORTDOCS%%%%SEMIDOCDIR%%/TODO %%PORTDOCS%%%%SEMIDOCDIR%%/VERSION %%PORTDOCS%%@dirrm %%SEMIDOCDIR%% -@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir -info/mime-ui-en.info -@exec install-info %D/info/mime-ui-en.info %D/info/dir -@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir -info/mime-ui-ja.info -@exec install-info %D/info/mime-ui-ja.info %D/info/dir share/semi/%%SEMI_COOKIE%% @dirrmtry share/semi