Fix situation with info files.

2 files changed, 11 insertions, 40 deletions

diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 8e5a324a8ea4..dc4af2a3746d 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -37,22 +37,26 @@ MAN1=		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
 		${PKGNAMEPREFIX}ld.1 ${PKGNAMEPREFIX}dlltool.1 \
 		${PKGNAMEPREFIX}readelf.1 ${PKGNAMEPREFIX}windres.1
 
+INFO=		bfd binutils as ld standards configure
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
+
 PLIST_SUB+=	BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//}
 
 BINARIES=	addr2line ar as c++filt ld nm objcopy objdump ranlib \
 		readelf size strings strip
 
-INFO_NOAUTO=	bfd.info binutils.info as.info ld.info \
-		standards.info configure.info
-
 post-install:
+# Register these too
+	install-info ${PREFIX}/${INFO_PATH}/configure.info ${PREFIX}/${INFO_PATH}/dir
+	install-info ${PREFIX}/${INFO_PATH}/standards.info ${PREFIX}/${INFO_PATH}/dir
+# This should go after all *.info stuff
+	${ECHO} "@unexec rm %D/${PKGNAMEPREFIX:S/-$//}/info/dir" >> ${TMPPLIST}
+	${ECHO} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
+	${ECHO} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
 .for F in ${BINARIES}
 	@${STRIP_CMD} ${PREFIX}/bin/${PKGNAMEPREFIX}$F
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
-.for F in ${INFO_NOAUTO}
-	install-info ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/${F} ${PREFIX}/info/dir
-.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/msp430-binutils/pkg-plist b/devel/msp430-binutils/pkg-plist
index bcb7e058f613..cec58dc13d98 100644
--- a/devel/msp430-binutils/pkg-plist
+++ b/devel/msp430-binutils/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.7 2004-03-03 13:07:46 lev Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.8 2004-04-06 08:55:48 lev Exp $
 %%BINUTILS_TARG%%/bin/addr2line
 %%BINUTILS_TARG%%/bin/ar
 %%BINUTILS_TARG%%/bin/as
@@ -285,39 +285,6 @@ bin/%%BINUTILS_TARG%%-readelf
 bin/%%BINUTILS_TARG%%-strip
 bin/%%BINUTILS_TARG%%-size
 bin/%%BINUTILS_TARG%%-strings
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/bfd.info %D/%%BINUTILS_TARG%%/info/dir
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/binutils.info %D/%%BINUTILS_TARG%%/info/dir
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/as.info %D/%%BINUTILS_TARG%%/info/dir
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/ld.info %D/%%BINUTILS_TARG%%/info/dir
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/configure.info %D/%%BINUTILS_TARG%%/info/dir
-%%BINUTILS_TARG%%/info/bfd.info
-%%BINUTILS_TARG%%/info/bfd.info-1
-%%BINUTILS_TARG%%/info/bfd.info-2
-%%BINUTILS_TARG%%/info/bfd.info-3
-%%BINUTILS_TARG%%/info/bfd.info-4
-%%BINUTILS_TARG%%/info/bfd.info-5
-%%BINUTILS_TARG%%/info/bfd.info-6
-%%BINUTILS_TARG%%/info/bfd.info-7
-%%BINUTILS_TARG%%/info/bfd.info-8
-%%BINUTILS_TARG%%/info/bfd.info-9
-%%BINUTILS_TARG%%/info/binutils.info
-%%BINUTILS_TARG%%/info/as.info
-%%BINUTILS_TARG%%/info/ld.info
-%%BINUTILS_TARG%%/info/standards.info
-%%BINUTILS_TARG%%/info/configure.info
-%%BINUTILS_TARG%%/info/configure.info-1
-%%BINUTILS_TARG%%/info/configure.info-2
-%%BINUTILS_TARG%%/info/configure.info-3
-%%BINUTILS_TARG%%/info/dir
-@exec install-info %D/%%BINUTILS_TARG%%/info/bfd.info %D/%%BINUTILS_TARG%%/info/dir
-@exec install-info %D/%%BINUTILS_TARG%%/info/binutils.info %D/%%BINUTILS_TARG%%/info/dir
-@exec install-info %D/%%BINUTILS_TARG%%/info/as.info %D/%%BINUTILS_TARG%%/info/dir
-@exec install-info %D/%%BINUTILS_TARG%%/info/ld.info %D/%%BINUTILS_TARG%%/info/dir
-@exec install-info %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir
-@exec install-info %D/%%BINUTILS_TARG%%/info/configure.info %D/%%BINUTILS_TARG%%/info/dir
 @dirrm %%BINUTILS_TARG%%/bin
 @dirrm %%BINUTILS_TARG%%/lib/ldscripts
 @dirrm %%BINUTILS_TARG%%/lib
-@dirrm %%BINUTILS_TARG%%/info
-@dirrm %%BINUTILS_TARG%%