aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/elisp-manual/Makefile7
-rw-r--r--japanese/emacs-manual/Makefile7
-rw-r--r--lang/gcc30/Makefile3
-rw-r--r--print/a2ps-letter/Makefile3
-rw-r--r--print/hp2xx/Makefile5
-rw-r--r--security/heimdal/Makefile1
-rw-r--r--security/krb4/Makefile1
-rw-r--r--security/krb5-16/Makefile12
-rw-r--r--security/krb5-17/Makefile12
-rw-r--r--security/krb5-appl/Makefile12
-rw-r--r--security/krb5/Makefile12
-rw-r--r--security/lsh/Makefile2
-rw-r--r--shells/zsh/Makefile1
-rw-r--r--sysutils/coreutils/Makefile7
-rw-r--r--sysutils/pv/Makefile1
-rw-r--r--sysutils/stow/Makefile3
-rw-r--r--textproc/wdiff/Makefile3
-rw-r--r--www/boa/Makefile1
-rw-r--r--www/polipo/Makefile1
-rw-r--r--x11-toolkits/py-xlib/Makefile1
-rw-r--r--x11-wm/plwm/Makefile1
21 files changed, 17 insertions, 79 deletions
diff --git a/japanese/elisp-manual/Makefile b/japanese/elisp-manual/Makefile
index 75889d39a7a2..01bf0b29e3d7 100644
--- a/japanese/elisp-manual/Makefile
+++ b/japanese/elisp-manual/Makefile
@@ -19,6 +19,8 @@ PATCHFILES= elisp-manual-20-2.5-jp.ERRATA.000422.jis \
MAINTAINER= okazaki@FreeBSD.org
COMMENT= Japanese translation of the GNU Emacs Lisp Reference Manual
+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
+
EMACS_PORT_NAME= emacs20
EMACS_NO_RUN_DEPENDS= YES
USE_REINPLACE= yes
@@ -69,9 +71,4 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/info/$i.info ${PREFIX}/${INFO_PATH}
.endfor
-post-install:
-.for i in ${INFO}
- install-info ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
-.endfor
-
.include <bsd.port.mk>
diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index 0051843029d4..5c3247c6e5bc 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -17,6 +17,8 @@ DISTFILES= ${DISTNAME}.tgz ${EMACS_ARC}
MAINTAINER= okazaki@FreeBSD.org
COMMENT= Japanese translation of the GNU Emacs Manual
+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
+
EMACS_PORT_NAME= emacs20
EMACS_NO_RUN_DEPENDS= YES
USE_REINPLACE= yes
@@ -89,9 +91,4 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/info/$i.info ${PREFIX}/${INFO_PATH}
.endfor
-post-install:
-.for i in ${INFO}
- install-info ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
-.endfor
-
.include <bsd.port.post.mk>
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 5d72943e1063..386a950c2b12 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -127,9 +127,6 @@ post-install:
#.if defined(WANT_SHAREDLIBS)
# ${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
#.endif
-.for info in cpp cppinternals g77 gcc
- install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
cd ${PREFIX} ;\
${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l \
>${WRKDIR}/PLIST.gcc-lib
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index b66b17cb7667..52ca04decbcf 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -58,9 +58,6 @@ PLIST_SUB+= WITHEMACS="@comment "
post-install:
${STRIP_CMD} ${PREFIX}/bin/a2ps
(cd ${WRKSRC}/doc; ${MAKE} install)
- install-info ${PREFIX}/info/a2ps.info ${PREFIX}/info/dir
- install-info ${PREFIX}/info/ogonkify.info ${PREFIX}/info/dir
- install-info ${PREFIX}/info/regex.info ${PREFIX}/info/dir
${RM} -f ${PREFIX}/lib/liba2ps.la
.include <bsd.port.mk>
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 0770db72f2f9..9c880002bf01 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -39,9 +39,4 @@ LDFLAGS+= -L${X11BASE}/lib -lX11
PREVIEWER= to_x11
.endif
-post-install:
-.for info in hp2xx.info
- install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-
.include <bsd.port.mk>
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 4bc443f9239c..d31994200adc 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -87,7 +87,6 @@ pre-install:
.include "Makefile.man"
post-install:
- install-info ${PREFIX}/info/heimdal.info ${PREFIX}/info/dir
${SED} 's;%%PREFIX%%;${PREFIX};g' ${FILESDIR}/kdc.sh > \
${PREFIX}/etc/rc.d/kdc.sh.sample
diff --git a/security/krb4/Makefile b/security/krb4/Makefile
index 8d8936e2ae8b..8e81805443ff 100644
--- a/security/krb4/Makefile
+++ b/security/krb4/Makefile
@@ -37,7 +37,6 @@ CONFIGURE_ENV+= \
INFO= kth-krb
post-install:
- install-info ${PREFIX}/info/kth-krb.info ${PREFIX}/info/dir
${SED} -e "s~%%PREFIX%%~${PREFIX}~g" \
< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
@${ECHO_CMD} "*** ATTENTION ***"
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index a82377571a38..0efc31fa2e95 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -47,9 +47,6 @@ PLIST_SUB+= KRB4=""
PREFIX= ${KRB5_HOME}
.endif
-INFO_FILES= krb425.info krb5-admin.info krb5-install.info \
- krb5-user.info
-
MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
@@ -98,7 +95,7 @@ pre-build:
post-build:
@(cd ${WRKSRC}/../doc && \
- ${MAKE} ${INFO_FILES})
+ ${MAKE} ${INFO:S/$/.info/})
.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
@(cd ${WRKSRC}/../doc && \
${MAKE} ${HTML_DOCS})
@@ -123,11 +120,8 @@ post-install:
.endif
${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
# handle info files
-.for info in ${INFO_FILES}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
- install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.for info in ${INFO}
+ ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
.endfor
# fixup packing list (no libs without version numbers in aout case)
.if ${PORTOBJFORMAT} == "aout"
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index a82377571a38..0efc31fa2e95 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -47,9 +47,6 @@ PLIST_SUB+= KRB4=""
PREFIX= ${KRB5_HOME}
.endif
-INFO_FILES= krb425.info krb5-admin.info krb5-install.info \
- krb5-user.info
-
MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
@@ -98,7 +95,7 @@ pre-build:
post-build:
@(cd ${WRKSRC}/../doc && \
- ${MAKE} ${INFO_FILES})
+ ${MAKE} ${INFO:S/$/.info/})
.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
@(cd ${WRKSRC}/../doc && \
${MAKE} ${HTML_DOCS})
@@ -123,11 +120,8 @@ post-install:
.endif
${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
# handle info files
-.for info in ${INFO_FILES}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
- install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.for info in ${INFO}
+ ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
.endfor
# fixup packing list (no libs without version numbers in aout case)
.if ${PORTOBJFORMAT} == "aout"
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index a82377571a38..0efc31fa2e95 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -47,9 +47,6 @@ PLIST_SUB+= KRB4=""
PREFIX= ${KRB5_HOME}
.endif
-INFO_FILES= krb425.info krb5-admin.info krb5-install.info \
- krb5-user.info
-
MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
@@ -98,7 +95,7 @@ pre-build:
post-build:
@(cd ${WRKSRC}/../doc && \
- ${MAKE} ${INFO_FILES})
+ ${MAKE} ${INFO:S/$/.info/})
.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
@(cd ${WRKSRC}/../doc && \
${MAKE} ${HTML_DOCS})
@@ -123,11 +120,8 @@ post-install:
.endif
${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
# handle info files
-.for info in ${INFO_FILES}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
- install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.for info in ${INFO}
+ ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
.endfor
# fixup packing list (no libs without version numbers in aout case)
.if ${PORTOBJFORMAT} == "aout"
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index a82377571a38..0efc31fa2e95 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -47,9 +47,6 @@ PLIST_SUB+= KRB4=""
PREFIX= ${KRB5_HOME}
.endif
-INFO_FILES= krb425.info krb5-admin.info krb5-install.info \
- krb5-user.info
-
MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
@@ -98,7 +95,7 @@ pre-build:
post-build:
@(cd ${WRKSRC}/../doc && \
- ${MAKE} ${INFO_FILES})
+ ${MAKE} ${INFO:S/$/.info/})
.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
@(cd ${WRKSRC}/../doc && \
${MAKE} ${HTML_DOCS})
@@ -123,11 +120,8 @@ post-install:
.endif
${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
# handle info files
-.for info in ${INFO_FILES}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info}
-.endfor
-.for info in ${INFO_FILES:M*.info}
- install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.for info in ${INFO}
+ ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
.endfor
# fixup packing list (no libs without version numbers in aout case)
.if ${PORTOBJFORMAT} == "aout"
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index ecd24a82940d..57b27f2fe94e 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -59,8 +59,6 @@ post-install:
.for SBIN in lshd
${STRIP_CMD} ${PREFIX}/sbin/${SBIN}
.endfor
- install-info ${PREFIX}/info/lsh.info ${PREFIX}/info/dir
- install-info ${PREFIX}/info/nettle.info ${PREFIX}/info/dir
test:
(cd ${WRKSRC}/src/testsuite && ${SETENV} ${MAKE_ENV} \
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 426263888e87..2e805b35138b 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -134,7 +134,6 @@ pre-install:
@${MKDIR} ${PREFIX}/info
makeinfo --no-split --output=${PREFIX}/info/zsh.info \
${WRKSRC}/Doc/zsh.texi
- install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
.endif
post-install:
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index fdc5c39af671..af98a1bd9e71 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -53,8 +53,6 @@ MAN1= gbasename.1 gcat.1 gchgrp.1 gchmod.1 gchown.1 gchroot.1 gcksum.1 \
gunexpand.1 guniq.1 gunlink.1 guptime.1 gusers.1 gvdir.1 \
gwc.1 gwho.1 gwhoami.1 gyes.1
-INSTALL_INFO?= install-info
-
post-patch:
.if !defined(WITH_SUID)
@${REINPLACE_CMD} -e "s/u\+s/u\+w/g" ${WRKSRC}/src/Makefile.in
@@ -63,9 +61,6 @@ post-patch:
post-build:
@${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile
-post-install: install-info
-
-install-info:
- @${INSTALL_INFO} ${PREFIX}/info/${PORTNAME}.info ${PREFIX}/info/dir
+post-install:
.include <bsd.port.mk>
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index a9c55def0f41..94f900dbfd91 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -31,7 +31,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pv ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/quickref.1 ${PREFIX}/man/man1/pv.1
${INSTALL_MAN} ${WRKSRC}/doc/pv.info ${PREFIX}/info
- install-info ${PREFIX}/info/pv.info ${PREFIX}/info/dir
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index da6198f0a692..2a1d3035b573 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -23,11 +23,8 @@ USE_PERL5= yes
PLIST_FILES= bin/stow
INFO= stow
-INSTALL_INFO?= install-info
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/stow ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/stow.info ${PREFIX}/info
- @${INSTALL_INFO} ${PREFIX}/info/stow.info ${PREFIX}/info/dir
.include <bsd.port.mk>
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index 6bb17bff2775..5729f6689d40 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -21,7 +21,4 @@ MAN1= wdiff.1
INFO= wdiff
PLIST_FILES= bin/wdiff
-post-install:
- @install-info ${PREFIX}/${INFO_PATH}/wdiff.info ${PREFIX}/${INFO_PATH}/dir
-
.include <bsd.port.mk>
diff --git a/www/boa/Makefile b/www/boa/Makefile
index 76cfbe9bdc68..f6ffb695d808 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -48,7 +48,6 @@ do-install:
.endfor
.endif
@${INSTALL_DATA} ${WRKSRC}/docs/boa.info ${PREFIX}/info
- @install-info ${PREFIX}/info/boa.info ${PREFIX}/info/dir
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/boa.sh ]; then \
diff --git a/www/polipo/Makefile b/www/polipo/Makefile
index ea843d59e337..e1c547fbd25e 100644
--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@@ -64,7 +64,6 @@ do-install:
${CHGRP} -R ${PGRP} ${DESTDIR}${PCONFIGDIR}
.if !defined(NO_PTEXINFO)
${INSTALL_DATA} ${WRKSRC}/polipo.info ${DESTDIR}${PREFIX}/info/
- install-info ${PREFIX}/info/polipo.info ${DESTDIR}${PREFIX}/info/dir
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${DESTDIR}${DOCSDIR}
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 2f9b01d16f91..8e1b14380cfd 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -22,6 +22,5 @@ INFO= python-xlib
post-install:
@${INSTALL_DATA} ${WRKSRC}/doc/info/python-xlib.info ${PREFIX}/info/
- @install-info ${PREFIX}/info/python-xlib.info ${PREFIX}/info/dir
.include <bsd.port.mk>
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index 8c047bc708c0..f975e82c3e76 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -24,6 +24,5 @@ GNU_CONFIGURE= yes
pre-install:
makeinfo -o ${PREFIX}/info/plwm.info ${WRKSRC}/doc/plwm.texi
- install-info --section=X11 ${PREFIX}/info/plwm.info ${PREFIX}/info/dir
.include <bsd.port.mk>