Remove install-info from Makefile, it's automatically done when INFO is defined

7 files changed, 12 insertions, 40 deletions

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} \