svn commit: r359776 - in head/editors: flim semi

[Antoine Brodin]

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%%
- at unexec install-info --delete %D/info/mime-en.info %D/info/dir
-info/mime-en.info
- at exec install-info %D/info/mime-en.info %D/info/dir
- at unexec install-info --delete %D/info/mime-ja.info %D/info/dir
-info/mime-ja.info
- at 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%%
- at unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-info/mime-ui-en.info
- at exec install-info %D/info/mime-ui-en.info %D/info/dir
- at unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-ja.info
- at exec install-info %D/info/mime-ui-ja.info %D/info/dir
 share/semi/%%SEMI_COOKIE%%
 @dirrmtry share/semi