Depend on scrollkeeper to handle .omf files; pointed out by wiz@.

While here, fix handling of info files; thanks to seb@.
Bump PKGREVISION to 1.

2 files changed, 7 insertions, 300 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index be70d686480..0a6f475f298 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2005/01/07 07:44:37 rh Exp $
+# $NetBSD: Makefile,v 1.30 2005/02/02 14:38:12 jmmv Exp $
 #
 
 DISTNAME=	lilypond-2.4.3
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://lilypond.org/download/v2.4/
 
@@ -23,6 +24,7 @@ MAKEFILE=		GNUmakefile
 
 USE_MAKEINFO=	YES
 TEXINFO_REQD=	4.7
+INFO_DIR=	info/lilypond
 INFO_FILES=	lilypond.info lilypond-internals.info music-glossary.info
 
 CONFIGURE_ARGS+=--disable-optimising
@@ -30,7 +32,7 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED= 21 23
 # 22 has some regular expression problem
 
-SCRIPTS_DIR=	share/lilypond/${PKGVERSION}/scripts
+SCRIPTS_DIR=	share/lilypond/${PKGVERSION:S/nb${PKGREVISION}//}/scripts
 PLIST_SUBST+=	SCRIPTS_DIR=${SCRIPTS_DIR}
 MESSAGE_SUBST+=	SCRIPTS_DIR=${SCRIPTS_DIR}
 
@@ -43,6 +45,7 @@ post-install:
 .include "../../lang/guile/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/emacs.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST
index 014512d4343..b7aaf2d92c5 100644
--- a/print/lilypond/PLIST
+++ b/print/lilypond/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/12/31 20:58:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/02/02 14:38:12 jmmv Exp $
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly
@@ -8,302 +8,6 @@ bin/lilypond-latex
 bin/midi2ly
 bin/mup2ly
 bin/ps2png
-info/lilypond/lilypond-internals.info
-info/lilypond/lilypond-internals.info-1
-info/lilypond/lilypond-internals.info-10
-info/lilypond/lilypond-internals.info-11
-info/lilypond/lilypond-internals.info-12
-info/lilypond/lilypond-internals.info-13
-info/lilypond/lilypond-internals.info-14
-info/lilypond/lilypond-internals.info-15
-info/lilypond/lilypond-internals.info-16
-info/lilypond/lilypond-internals.info-2
-info/lilypond/lilypond-internals.info-3
-info/lilypond/lilypond-internals.info-4
-info/lilypond/lilypond-internals.info-5
-info/lilypond/lilypond-internals.info-6
-info/lilypond/lilypond-internals.info-7
-info/lilypond/lilypond-internals.info-8
-info/lilypond/lilypond-internals.info-9
-info/lilypond/lilypond.info
-info/lilypond/lilypond.info-1
-info/lilypond/lilypond.info-10
-info/lilypond/lilypond.info-11
-info/lilypond/lilypond.info-2
-info/lilypond/lilypond.info-3
-info/lilypond/lilypond.info-4
-info/lilypond/lilypond.info-5
-info/lilypond/lilypond.info-6
-info/lilypond/lilypond.info-7
-info/lilypond/lilypond.info-8
-info/lilypond/lilypond.info-9
-info/lilypond/music-glossary.info
-info/lilypond/music-glossary.info-1
-info/lilypond/music-glossary.info-10
-info/lilypond/music-glossary.info-100
-info/lilypond/music-glossary.info-101
-info/lilypond/music-glossary.info-102
-info/lilypond/music-glossary.info-103
-info/lilypond/music-glossary.info-104
-info/lilypond/music-glossary.info-105
-info/lilypond/music-glossary.info-106
-info/lilypond/music-glossary.info-107
-info/lilypond/music-glossary.info-108
-info/lilypond/music-glossary.info-109
-info/lilypond/music-glossary.info-11
-info/lilypond/music-glossary.info-110
-info/lilypond/music-glossary.info-111
-info/lilypond/music-glossary.info-112
-info/lilypond/music-glossary.info-113
-info/lilypond/music-glossary.info-114
-info/lilypond/music-glossary.info-115
-info/lilypond/music-glossary.info-116
-info/lilypond/music-glossary.info-117
-info/lilypond/music-glossary.info-118
-info/lilypond/music-glossary.info-119
-info/lilypond/music-glossary.info-12
-info/lilypond/music-glossary.info-120
-info/lilypond/music-glossary.info-121
-info/lilypond/music-glossary.info-122
-info/lilypond/music-glossary.info-123
-info/lilypond/music-glossary.info-124
-info/lilypond/music-glossary.info-125
-info/lilypond/music-glossary.info-126
-info/lilypond/music-glossary.info-127
-info/lilypond/music-glossary.info-128
-info/lilypond/music-glossary.info-129
-info/lilypond/music-glossary.info-13
-info/lilypond/music-glossary.info-130
-info/lilypond/music-glossary.info-131
-info/lilypond/music-glossary.info-132
-info/lilypond/music-glossary.info-133
-info/lilypond/music-glossary.info-134
-info/lilypond/music-glossary.info-135
-info/lilypond/music-glossary.info-136
-info/lilypond/music-glossary.info-137
-info/lilypond/music-glossary.info-138
-info/lilypond/music-glossary.info-139
-info/lilypond/music-glossary.info-14
-info/lilypond/music-glossary.info-140
-info/lilypond/music-glossary.info-141
-info/lilypond/music-glossary.info-142
-info/lilypond/music-glossary.info-143
-info/lilypond/music-glossary.info-144
-info/lilypond/music-glossary.info-145
-info/lilypond/music-glossary.info-146
-info/lilypond/music-glossary.info-147
-info/lilypond/music-glossary.info-148
-info/lilypond/music-glossary.info-149
-info/lilypond/music-glossary.info-15
-info/lilypond/music-glossary.info-150
-info/lilypond/music-glossary.info-151
-info/lilypond/music-glossary.info-152
-info/lilypond/music-glossary.info-153
-info/lilypond/music-glossary.info-154
-info/lilypond/music-glossary.info-155
-info/lilypond/music-glossary.info-156
-info/lilypond/music-glossary.info-157
-info/lilypond/music-glossary.info-158
-info/lilypond/music-glossary.info-159
-info/lilypond/music-glossary.info-16
-info/lilypond/music-glossary.info-160
-info/lilypond/music-glossary.info-161
-info/lilypond/music-glossary.info-162
-info/lilypond/music-glossary.info-163
-info/lilypond/music-glossary.info-164
-info/lilypond/music-glossary.info-165
-info/lilypond/music-glossary.info-166
-info/lilypond/music-glossary.info-167
-info/lilypond/music-glossary.info-168
-info/lilypond/music-glossary.info-169
-info/lilypond/music-glossary.info-17
-info/lilypond/music-glossary.info-170
-info/lilypond/music-glossary.info-171
-info/lilypond/music-glossary.info-172
-info/lilypond/music-glossary.info-173
-info/lilypond/music-glossary.info-174
-info/lilypond/music-glossary.info-175
-info/lilypond/music-glossary.info-176
-info/lilypond/music-glossary.info-177
-info/lilypond/music-glossary.info-178
-info/lilypond/music-glossary.info-179
-info/lilypond/music-glossary.info-18
-info/lilypond/music-glossary.info-180
-info/lilypond/music-glossary.info-181
-info/lilypond/music-glossary.info-182
-info/lilypond/music-glossary.info-183
-info/lilypond/music-glossary.info-184
-info/lilypond/music-glossary.info-185
-info/lilypond/music-glossary.info-186
-info/lilypond/music-glossary.info-187
-info/lilypond/music-glossary.info-188
-info/lilypond/music-glossary.info-189
-info/lilypond/music-glossary.info-19
-info/lilypond/music-glossary.info-190
-info/lilypond/music-glossary.info-191
-info/lilypond/music-glossary.info-192
-info/lilypond/music-glossary.info-193
-info/lilypond/music-glossary.info-194
-info/lilypond/music-glossary.info-195
-info/lilypond/music-glossary.info-196
-info/lilypond/music-glossary.info-197
-info/lilypond/music-glossary.info-198
-info/lilypond/music-glossary.info-199
-info/lilypond/music-glossary.info-2
-info/lilypond/music-glossary.info-20
-info/lilypond/music-glossary.info-200
-info/lilypond/music-glossary.info-201
-info/lilypond/music-glossary.info-202
-info/lilypond/music-glossary.info-203
-info/lilypond/music-glossary.info-204
-info/lilypond/music-glossary.info-205
-info/lilypond/music-glossary.info-206
-info/lilypond/music-glossary.info-207
-info/lilypond/music-glossary.info-208
-info/lilypond/music-glossary.info-209
-info/lilypond/music-glossary.info-21
-info/lilypond/music-glossary.info-210
-info/lilypond/music-glossary.info-211
-info/lilypond/music-glossary.info-212
-info/lilypond/music-glossary.info-213
-info/lilypond/music-glossary.info-214
-info/lilypond/music-glossary.info-215
-info/lilypond/music-glossary.info-216
-info/lilypond/music-glossary.info-217
-info/lilypond/music-glossary.info-218
-info/lilypond/music-glossary.info-219
-info/lilypond/music-glossary.info-22
-info/lilypond/music-glossary.info-220
-info/lilypond/music-glossary.info-221
-info/lilypond/music-glossary.info-222
-info/lilypond/music-glossary.info-223
-info/lilypond/music-glossary.info-224
-info/lilypond/music-glossary.info-225
-info/lilypond/music-glossary.info-226
-info/lilypond/music-glossary.info-227
-info/lilypond/music-glossary.info-228
-info/lilypond/music-glossary.info-229
-info/lilypond/music-glossary.info-23
-info/lilypond/music-glossary.info-230
-info/lilypond/music-glossary.info-231
-info/lilypond/music-glossary.info-232
-info/lilypond/music-glossary.info-233
-info/lilypond/music-glossary.info-234
-info/lilypond/music-glossary.info-235
-info/lilypond/music-glossary.info-236
-info/lilypond/music-glossary.info-237
-info/lilypond/music-glossary.info-238
-info/lilypond/music-glossary.info-239
-info/lilypond/music-glossary.info-24
-info/lilypond/music-glossary.info-240
-info/lilypond/music-glossary.info-241
-info/lilypond/music-glossary.info-242
-info/lilypond/music-glossary.info-243
-info/lilypond/music-glossary.info-244
-info/lilypond/music-glossary.info-245
-info/lilypond/music-glossary.info-246
-info/lilypond/music-glossary.info-247
-info/lilypond/music-glossary.info-248
-info/lilypond/music-glossary.info-249
-info/lilypond/music-glossary.info-25
-info/lilypond/music-glossary.info-250
-info/lilypond/music-glossary.info-251
-info/lilypond/music-glossary.info-252
-info/lilypond/music-glossary.info-253
-info/lilypond/music-glossary.info-254
-info/lilypond/music-glossary.info-255
-info/lilypond/music-glossary.info-256
-info/lilypond/music-glossary.info-257
-info/lilypond/music-glossary.info-258
-info/lilypond/music-glossary.info-259
-info/lilypond/music-glossary.info-26
-info/lilypond/music-glossary.info-260
-info/lilypond/music-glossary.info-261
-info/lilypond/music-glossary.info-262
-info/lilypond/music-glossary.info-263
-info/lilypond/music-glossary.info-264
-info/lilypond/music-glossary.info-265
-info/lilypond/music-glossary.info-266
-info/lilypond/music-glossary.info-27
-info/lilypond/music-glossary.info-28
-info/lilypond/music-glossary.info-29
-info/lilypond/music-glossary.info-3
-info/lilypond/music-glossary.info-30
-info/lilypond/music-glossary.info-31
-info/lilypond/music-glossary.info-32
-info/lilypond/music-glossary.info-33
-info/lilypond/music-glossary.info-34
-info/lilypond/music-glossary.info-35
-info/lilypond/music-glossary.info-36
-info/lilypond/music-glossary.info-37
-info/lilypond/music-glossary.info-38
-info/lilypond/music-glossary.info-39
-info/lilypond/music-glossary.info-4
-info/lilypond/music-glossary.info-40
-info/lilypond/music-glossary.info-41
-info/lilypond/music-glossary.info-42
-info/lilypond/music-glossary.info-43
-info/lilypond/music-glossary.info-44
-info/lilypond/music-glossary.info-45
-info/lilypond/music-glossary.info-46
-info/lilypond/music-glossary.info-47
-info/lilypond/music-glossary.info-48
-info/lilypond/music-glossary.info-49
-info/lilypond/music-glossary.info-5
-info/lilypond/music-glossary.info-50
-info/lilypond/music-glossary.info-51
-info/lilypond/music-glossary.info-52
-info/lilypond/music-glossary.info-53
-info/lilypond/music-glossary.info-54
-info/lilypond/music-glossary.info-55
-info/lilypond/music-glossary.info-56
-info/lilypond/music-glossary.info-57
-info/lilypond/music-glossary.info-58
-info/lilypond/music-glossary.info-59
-info/lilypond/music-glossary.info-6
-info/lilypond/music-glossary.info-60
-info/lilypond/music-glossary.info-61
-info/lilypond/music-glossary.info-62
-info/lilypond/music-glossary.info-63
-info/lilypond/music-glossary.info-64
-info/lilypond/music-glossary.info-65
-info/lilypond/music-glossary.info-66
-info/lilypond/music-glossary.info-67
-info/lilypond/music-glossary.info-68
-info/lilypond/music-glossary.info-69
-info/lilypond/music-glossary.info-7
-info/lilypond/music-glossary.info-70
-info/lilypond/music-glossary.info-71
-info/lilypond/music-glossary.info-72
-info/lilypond/music-glossary.info-73
-info/lilypond/music-glossary.info-74
-info/lilypond/music-glossary.info-75
-info/lilypond/music-glossary.info-76
-info/lilypond/music-glossary.info-77
-info/lilypond/music-glossary.info-78
-info/lilypond/music-glossary.info-79
-info/lilypond/music-glossary.info-8
-info/lilypond/music-glossary.info-80
-info/lilypond/music-glossary.info-81
-info/lilypond/music-glossary.info-82
-info/lilypond/music-glossary.info-83
-info/lilypond/music-glossary.info-84
-info/lilypond/music-glossary.info-85
-info/lilypond/music-glossary.info-86
-info/lilypond/music-glossary.info-87
-info/lilypond/music-glossary.info-88
-info/lilypond/music-glossary.info-89
-info/lilypond/music-glossary.info-9
-info/lilypond/music-glossary.info-90
-info/lilypond/music-glossary.info-91
-info/lilypond/music-glossary.info-92
-info/lilypond/music-glossary.info-93
-info/lilypond/music-glossary.info-94
-info/lilypond/music-glossary.info-95
-info/lilypond/music-glossary.info-96
-info/lilypond/music-glossary.info-97
-info/lilypond/music-glossary.info-98
-info/lilypond/music-glossary.info-99
 lib/lilypond/${PKGVERSION}/python/midi.so
 man/man1/abc2ly.1
 man/man1/convert-ly.1
@@ -813,7 +517,7 @@ share/omf/lilypond/${PKGVERSION}/music-glossary.pdf.omf
 share/omf/lilypond/${PKGVERSION}/music-glossary.ps.gz.omf
 @dirrm share/omf/lilypond/${PKGVERSION}
 @dirrm share/omf/lilypond
-@dirrm share/omf
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/lilypond/${PKGVERSION}/vim/syntax
 @dirrm share/lilypond/${PKGVERSION}/vim/indent
 @dirrm share/lilypond/${PKGVERSION}/vim/ftplugin