Unbreak on 6.x by carefully specifying .info files.

2 files changed, 60 insertions, 58 deletions

diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 3d72909e1866..24684b6570be 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -41,8 +41,10 @@ MAN1=		emacs.1 etags.1 ctags.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-BROKEN=		"invalid packing list"
+.if ${OSVERSION} > 600000
+PLIST_SUB+=	NOTON6="@comment "
+.else
+PLIST_SUB+=	NOTON6=""
 .endif
 
 post-install:
diff --git a/editors/emacs19/pkg-plist b/editors/emacs19/pkg-plist
index bd28773b2034..962cd90127b9 100644
--- a/editors/emacs19/pkg-plist
+++ b/editors/emacs19/pkg-plist
@@ -26,80 +26,80 @@ etc/rc.d/emacs.sh
 @unexec install-info --delete %D/info/ccmode %D/info/dir
 @unexec install-info --delete %D/info/message %D/info/dir
 info/ccmode
-info/ccmode-1
-info/ccmode-2
+%%NOTON6%%info/ccmode-1
+%%NOTON6%%info/ccmode-2
 info/cl
-info/cl-1
-info/cl-2
-info/cl-3
-info/cl-4
-info/cl-5
-info/cl-6
+%%NOTON6%%info/cl-1
+%%NOTON6%%info/cl-2
+%%NOTON6%%info/cl-3
+%%NOTON6%%info/cl-4
+%%NOTON6%%info/cl-5
+%%NOTON6%%info/cl-6
 info/dired-x
 info/ediff
-info/ediff-1
-info/ediff-2
+%%NOTON6%%info/ediff-1
+%%NOTON6%%info/ediff-2
 info/emacs
 info/emacs-1
-info/emacs-10
-info/emacs-11
-info/emacs-12
-info/emacs-13
-info/emacs-14
-info/emacs-15
-info/emacs-16
-info/emacs-17
-info/emacs-18
-info/emacs-19
+%%NOTON6%%info/emacs-10
+%%NOTON6%%info/emacs-11
+%%NOTON6%%info/emacs-12
+%%NOTON6%%info/emacs-13
+%%NOTON6%%info/emacs-14
+%%NOTON6%%info/emacs-15
+%%NOTON6%%info/emacs-16
+%%NOTON6%%info/emacs-17
+%%NOTON6%%info/emacs-18
+%%NOTON6%%info/emacs-19
 info/emacs-2
-info/emacs-20
-info/emacs-21
-info/emacs-22
-info/emacs-23
-info/emacs-24
-info/emacs-25
-info/emacs-26
-info/emacs-27
-info/emacs-28
-info/emacs-29
+%%NOTON6%%info/emacs-20
+%%NOTON6%%info/emacs-21
+%%NOTON6%%info/emacs-22
+%%NOTON6%%info/emacs-23
+%%NOTON6%%info/emacs-24
+%%NOTON6%%info/emacs-25
+%%NOTON6%%info/emacs-26
+%%NOTON6%%info/emacs-27
+%%NOTON6%%info/emacs-28
+%%NOTON6%%info/emacs-29
 info/emacs-3
 info/emacs-4
 info/emacs-5
-info/emacs-6
-info/emacs-7
-info/emacs-8
-info/emacs-9
+%%NOTON6%%info/emacs-6
+%%NOTON6%%info/emacs-7
+%%NOTON6%%info/emacs-8
+%%NOTON6%%info/emacs-9
 info/forms
 info/gnus
 info/gnus-1
 info/gnus-2
-info/gnus-3
-info/gnus-4
-info/gnus-5
-info/gnus-6
-info/gnus-7
-info/gnus-8
-info/gnus-9
-info/gnus-10
-info/gnus-11
+%%NOTON6%%info/gnus-3
+%%NOTON6%%info/gnus-4
+%%NOTON6%%info/gnus-5
+%%NOTON6%%info/gnus-6
+%%NOTON6%%info/gnus-7
+%%NOTON6%%info/gnus-8
+%%NOTON6%%info/gnus-9
+%%NOTON6%%info/gnus-10
+%%NOTON6%%info/gnus-11
 info/message
 info/mh-e
-info/mh-e-1
-info/mh-e-2
-info/mh-e-3
-info/mh-e-4
+%%NOTON6%%info/mh-e-1
+%%NOTON6%%info/mh-e-2
+%%NOTON6%%info/mh-e-3
+%%NOTON6%%info/mh-e-4
 info/sc
-info/sc-1
-info/sc-2
-info/sc-3
+%%NOTON6%%info/sc-1
+%%NOTON6%%info/sc-2
+%%NOTON6%%info/sc-3
 info/vip
-info/vip-1
-info/vip-2
+%%NOTON6%%info/vip-1
+%%NOTON6%%info/vip-2
 info/viper
-info/viper-1
-info/viper-2
-info/viper-3
-info/viper-4
+%%NOTON6%%info/viper-1
+%%NOTON6%%info/viper-2
+%%NOTON6%%info/viper-3
+%%NOTON6%%info/viper-4
 @exec install-info %D/info/emacs %D/info/dir
 @exec install-info %D/info/vip %D/info/dir
 @exec install-info %D/info/viper %D/info/dir