Attachment #213590 for bug #243970




# $FreeBSD$

PORTNAME=	lilypond
DISTVERSION=	2.20.0
PORTREVISION=	1
CATEGORIES=	print audio
MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
PKGNAMESUFFIX=	-devel

		rsync:net/rsync \
		texi2html:textproc/texi2html \
		zip:archivers/zip
RUN_DEPENDS=	mftrace:print/mftrace \
		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
LIB_DEPENDS=	libltdl.so:devel/libltdl \
		libguile.so:lang/guile1 \
		libgmp.so:math/gmp \
		libfreetype.so:print/freetype2 \
		libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS=	mftrace:print/mftrace \
		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu

INFO=		internals \
		lilypond-changes \
		lilypond-contributor \
		lilypond-essay \
		lilypond-extending \
		lilypond-internals \
		lilypond-learning \
		lilypond-notation \
		lilypond-snippets \
		lilypond-usage \
		lilypond-web \
		music-glossary

USES=		bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \
		gnome perl5 pkgconfig python:2.7
USE_CXXSTD=	c++11
USE_GNOME=	pango
USE_PERL5=	build
USE_TEX=	latex texmf
USE_PERL5=	build
USE_GNOME=	pango

MAKEFILE=	GNUmakefile

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
		--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir

CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
		FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}

MAKEFILE=	GNUmakefile
ALL_TARGET=	all

INFO=		internals \
		lilypond-changes \
		lilypond-contributor \
		lilypond-essay \
		lilypond-extending \
		lilypond-internals \
		lilypond-learning \
		lilypond-notation \
		lilypond-snippets \
		lilypond-usage \
		lilypond-web \
		music-glossary
PLIST_SUB=	DISTVERSION=${DISTVERSION}

OPTIONS_DEFINE=	NLS

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1554060216	1	TIMESTAMP = 1587345646
2	SHA256 (lilypond-2.19.83.tar.gz) = 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3	2	SHA256 (lilypond-2.20.0.tar.gz) = 595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
3	SIZE (lilypond-2.19.83.tar.gz) = 17996428	3	SIZE (lilypond-2.20.0.tar.gz) = 18100533

Lines 1-6 Link Here

(-)files/patch-Documentation_GNUmakefile (-2 / +2 lines)
1	--- Documentation/GNUmakefile.orig 2017-02-26 12:08:59 UTC	1	--- Documentation/GNUmakefile.orig 2020-02-04 16:12:57 UTC
2	+++ Documentation/GNUmakefile	2	+++ Documentation/GNUmakefile
3	@@ -73,9 +73,9 @@ source-links = $(outdir)/source\	3	@@ -74,9 +74,9 @@ source-links = $(outdir)/source\
4	MAIN_INFO_DOC = lilypond-web	4	MAIN_INFO_DOC = lilypond-web
5	INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \	5	INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
6	lilypond-essay lilypond-learning lilypond-notation music-glossary \	6	lilypond-essay lilypond-learning lilypond-notation music-glossary \

Lines 1-6 Link Here

(-)files/patch-config.make.in (-2 / +2 lines)
1	--- config.make.in.orig 2017-02-26 12:08:59 UTC	1	--- config.make.in.orig 2020-02-04 16:12:57 UTC
2	+++ config.make.in	2	+++ config.make.in
3	@@ -69,7 +69,7 @@ sharedstatedir = @sharedstatedir@	3	@@ -73,7 +73,7 @@ sharedstatedir = @sharedstatedir@
4	stepmake = @stepmake@	4	stepmake = @stepmake@
5		5
6	package_datadir = $(datadir)/$(package)	6	package_datadir = $(datadir)/$(package)

Lines 1-25 Link Here

(-)files/patch-configure (-30 / +48 lines)
1	--- configure.orig 2019-03-20 13:52:23 UTC	1	--- configure.orig 2020-03-01 14:00:51 UTC
2	+++ configure	2	+++ configure
3	@@ -10512,13 +10512,8 @@ $as_echo_n "checking $r version... " >&6; }	3	@@ -2298,13 +2298,8 @@ $as_echo_n "checking $r version... " >&6; }
4	## for compatibility reasons.	4	## for compatibility reasons.
5		5
6	## grab the first version number in --version output.	6	## grab the first version number in --version output.
7	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|	7	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|
8	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|	8	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
9	- head -n 1 \|	9	- head -n 1 \|
10	- tr ' ' '\n' \|	10	- tr ' ' '\n' \|
11	- sed 's/$[0-9][0-9]\.[0-9][0-9.]$.*/\1/g' \|	11	- sed 's/$[0-9][0-9]\.[0-9][0-9.]$.*/\1/g' \|
12	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|	12	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
13	- head -n 1\`\"	13	- head -n 1\`\"
14	+ eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>/dev/null \|	14	+ eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>/dev/null \|
15	+ awk '$1 ~ "fontforge" { print $2 }'\`\"	15	+ awk '$1 ~ "fontforge" { print $2 }'\`\"
16		16
17	if test -z "$_ver"; then	17	if test -z "$_ver"; then
18	## If empty, try date [fontforge]	18	## If empty, try date [fontforge]
19	@@ -11595,75 +11590,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"	19	@@ -11631,71 +11626,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
		20	if test $? -eq 0; then
		21	if test -n "0.9.0" -o -n ""; then
20		22
21	if test $? -eq 0 -a -n "0.9.0"; then
22
23	- r="`eval echo '$'"PKG_CONFIG"`"	23	- r="`eval echo '$'"PKG_CONFIG"`"
24	- { $as_echo "$as_me:$LINENO: checking $r version" >&5	24	- { $as_echo "$as_me:$LINENO: checking $r version" >&5
25	-$as_echo_n "checking $r version... " >&6; }	25	-$as_echo_n "checking $r version... " >&6; }
Lines 31-40 Link Here
31	- ## this test should work in ash, bash, pdksh (ksh), zsh	31	- ## this test should work in ash, bash, pdksh (ksh), zsh
32	- type -p $r 2>/dev/null \| tail -n 1 \| awk '{print $NF}'	32	- type -p $r 2>/dev/null \| tail -n 1 \| awk '{print $NF}'
33	-`	33	-`
34	- if test -n ""; then	34	- ver=`
35	- ver=""
36	- else
37	- ver=`
38	- ## "$exe" --version 2>&1 \| grep -v '^$' \| head -n 1 \| awk '{print $NF}'	35	- ## "$exe" --version 2>&1 \| grep -v '^$' \| head -n 1 \| awk '{print $NF}'
39	- ##	36	- ##
40	- ## ARG.	37	- ## ARG.
Lines 50-75 Link Here
50	- ## use eval trickery, because we cannot use multi-level $() instead of ``	47	- ## use eval trickery, because we cannot use multi-level $() instead of ``
51	- ## for compatibility reasons.	48	- ## for compatibility reasons.
52	-	49	-
53	- ## grab the first version number in --version output.	50	- ## grab the first version number in --version output.
54	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|	51	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|
55	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|	52	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
56	- head -n 1 \|	53	- head -n 1 \|
57	- tr ' ' '\n' \|	54	- tr ' ' '\n' \|
58	- sed 's/$[0-9][0-9]\.[0-9][0-9.]$.*/\1/g' \|	55	- sed 's/$[0-9][0-9]\.[0-9][0-9.]$.*/\1/g' \|
59	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|	56	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
60	- head -n 1\`\"	57	- head -n 1\`\"
61	-	58	-
62	- if test -z "$_ver"; then	59	- if test -z "$_ver"; then
63	- ## If empty, try date [fontforge]	60	- ## If empty, try date [fontforge]
64	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \	61	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \
65	- \| grep '$^\\|[^0-9a-f]$[0-9]\{6,8\}$[^0-9a-f]\\|$$' \	62	- \| grep '$^\\|[^0-9a-f]$[0-9]\{6,8\}$[^0-9a-f]\\|$$' \
66	- \| head -n 1 \	63	- \| head -n 1 \
67	- \| sed -e 's/^[^.0-9]//' -e 's/[^.0-9]$//'\`\"	64	- \| sed -e 's/^[^.0-9]//' -e 's/[^.0-9]$//'\`\"
68	- fi	65	- fi
69	- echo "$_ver"	66	- echo "$_ver"
70	- #dnl	67	- #dnl
71	-`	68	-`
72	- fi
73	- num=`	69	- num=`
74	- echo "$ver" \| awk -F. '	70	- echo "$ver" \| awk -F. '
75	- {	71	- {
Lines 78-84 Link Here
78	- }	74	- }
79	- {printf "%.0f\n", $11000000 + $21000 + three}'	75	- {printf "%.0f\n", $11000000 + $21000 + three}'
80	-`	76	-`
81	- req=`	77	- min=`
82	- echo "0.9.0" \| awk -F. '	78	- echo "0.9.0" \| awk -F. '
83	- {	79	- {
84	- if ($3) {three = $3}	80	- if ($3) {three = $3}
Lines 88-94 Link Here
88	-`	84	-`
89	- { $as_echo "$as_me:$LINENO: result: $ver" >&5	85	- { $as_echo "$as_me:$LINENO: result: $ver" >&5
90	-$as_echo "$ver" >&6; }	86	-$as_echo "$ver" >&6; }
91	- if test "$num" -lt "$req"; then	87	- if test "$num" -lt "$min"; then
92	-	88	-
93	+ if test ! $?; then	89	+ if test ! $?; then
94	+ ver=`$PKG_CONFIG --version`	90	+ ver=`$PKG_CONFIG --version`
Lines 95-97 Link Here
95	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"	91	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
96		92
97	fi	93	fi
		94	@@ -15001,21 +14935,6 @@ $as_echo "$ver" >&6; }
		95
		96	eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 1.82 (installed: $ver)"\"`\"
		97
		98	- fi
		99	- if test -n "1.82"; then
		100	- max=`
		101	- echo "1.82" \| awk -F. '
		102	- {
		103	- if ($3) {three = $3}
		104	- else {three = 0}
		105	- }
		106	- {printf "%.0f\n", $11000000 + $21000 + three}'
		107	-`
		108	- if test "$num" -gt "$max"; then
		109	-
		110	- eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r <= 1.82 (installed: $ver)"\"`\"
		111	-
		112	- fi
		113	fi
		114	vervar="`echo TEXI2HTML \| tr 'a-z' 'A-Z'`_VERSION"
		115	eval `echo $vervar=$num`

Lines 1-4 Link Here

(-)files/patch-flower_include_std-string.hh (-2 / +2 lines)
1	--- flower/include/std-string.hh.orig 2017-02-26 12:08:59 UTC	1	--- flower/include/std-string.hh.orig 2020-03-01 14:00:51 UTC
2	+++ flower/include/std-string.hh	2	+++ flower/include/std-string.hh
3	@@ -38,6 +38,7 @@ using namespace std;	3	@@ -38,6 +38,7 @@ using namespace std;
4	typedef size_t ssize;	4	typedef size_t ssize;
Lines 5-11 Link Here
5	#define NPOS string::npos	5	#define NPOS string::npos
6		6
7	+#if _cplusplus <= 19971L	7	+#if _cplusplus <= 19971L
8	string to_string (const string&);	8	string to_string (const string &);
9	string to_string (char c, int n = 1);	9	string to_string (char c, int n = 1);
10	string to_string (int i, char const *format = 0);	10	string to_string (int i, char const *format = 0);
11	@@ -49,6 +50,7 @@ string to_string (unsigned);	11	@@ -49,6 +50,7 @@ string to_string (unsigned);

Lines 1-6 Link Here

(-)files/patch-flower_include_std-vector.hh (-2 / +2 lines)
1	--- flower/include/std-vector.hh.orig 2017-02-26 12:08:59 UTC	1	--- flower/include/std-vector.hh.orig 2020-02-04 16:12:57 UTC
2	+++ flower/include/std-vector.hh	2	+++ flower/include/std-vector.hh
3	@@ -212,6 +212,6 @@ junk_pointers (vector<T> &v)	3	@@ -224,6 +224,6 @@ junk_pointers (vector<T> &v)
4	vector<string> string_split (string str, char c);	4	vector<string> string_split (string str, char c);
5	string string_join (vector<string> const &strs, const string &infix);	5	string string_join (vector<string> const &strs, const string &infix);
6		6

Lines 1-9 Link Here

(-)files/patch-lily_include_lily-guile.hh (-4 / +4 lines)
1	--- lily/include/lily-guile.hh.orig 2017-02-26 12:08:59 UTC	1	--- lily/include/lily-guile.hh.orig 2020-02-04 16:12:57 UTC
2	+++ lily/include/lily-guile.hh	2	+++ lily/include/lily-guile.hh
3	@@ -20,6 +20,8 @@	3	@@ -22,6 +22,8 @@
4	#ifndef LILY_GUILE_HH
5	#define LILY_GUILE_HH
6		4
		5	#include "config.hh"
		6
7	+#include <cstddef>	7	+#include <cstddef>
8	+	8	+
9	#if __MINGW32__	9	#if __MINGW32__

Lines 1-6 Link Here

(-)files/patch-python_GNUmakefile (-2 / +2 lines)
1	--- python/GNUmakefile.orig 2017-02-26 12:08:59 UTC	1	--- python/GNUmakefile.orig 2020-02-04 16:12:57 UTC
2	+++ python/GNUmakefile	2	+++ python/GNUmakefile
3	@@ -14,7 +14,6 @@ CONFIG_LDFLAGS=	3	@@ -12,7 +12,6 @@ CONFIG_LDFLAGS=
4	INSTALLATION_OUT_SUFFIXES=1	4	INSTALLATION_OUT_SUFFIXES=1
5		5
6	INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)	6	INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)

Lines 1-11 Link Here

(-)files/patch-stepmake_stepmake_texinfo-vars.make (-3 / +3 lines)
1	--- stepmake/stepmake/texinfo-vars.make.orig 2017-02-26 12:08:59 UTC	1	--- stepmake/stepmake/texinfo-vars.make.orig 2020-03-01 14:00:51 UTC
2	+++ stepmake/stepmake/texinfo-vars.make	2	+++ stepmake/stepmake/texinfo-vars.make
3	@@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-t	3	@@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba
4		4
5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)	5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
6		6
7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)	7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)	8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
9	MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)	9	MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
10		10
11	# texi2html xref map files	11	# texi2html xref map files

Lines 7-12 Link Here

(-)pkg-descr (-3 / +1 lines)
7	tool, midi2ly. Conversion tools for PMX, MUP, ABC, Finale and	7	tool, midi2ly. Conversion tools for PMX, MUP, ABC, Finale and
8	Musedata are also included.	8	Musedata are also included.
9		9
10	WWW: http://lilypond.org/	10	WWW: https://lilypond.org/
11
12	Patrick Atamaniuk

Lines 277-283 Link Here

(-)pkg-plist (-1 lines)
277	%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm	277	%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm
278	%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm	278	%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm
279	%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm	279	%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm
280	%%DATADIR%%/%%DISTVERSION%%/scm/coverage.scm
281	%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm	280	%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm
282	%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm	281	%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm
283	%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm	282	%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm

Return to bug 243970

Lines 2-9 Link Here

(-)Makefile (-22 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lilypond	4	PORTNAME= lilypond
5	DISTVERSION= 2.19.83	5	DISTVERSION= 2.20.0
6	PORTREVISION= 1
7	CATEGORIES= print audio	6	CATEGORIES= print audio
8	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/	7	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/
9	PKGNAMESUFFIX= -devel	8	PKGNAMESUFFIX= -devel
Lines 27-62 Link Here
27	rsync:net/rsync \	26	rsync:net/rsync \
28	texi2html:textproc/texi2html \	27	texi2html:textproc/texi2html \
29	zip:archivers/zip	28	zip:archivers/zip
30	RUN_DEPENDS= mftrace:print/mftrace \
31	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
32	LIB_DEPENDS= libltdl.so:devel/libltdl \	29	LIB_DEPENDS= libltdl.so:devel/libltdl \
33	libguile.so:lang/guile \	30	libguile.so:lang/guile1 \
34	libgmp.so:math/gmp \	31	libgmp.so:math/gmp \
35	libfreetype.so:print/freetype2 \	32	libfreetype.so:print/freetype2 \
36	libfontconfig.so:x11-fonts/fontconfig	33	libfontconfig.so:x11-fonts/fontconfig
		34	RUN_DEPENDS= mftrace:print/mftrace \
		35	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
37		36
38	INFO= internals \
39	lilypond-changes \
40	lilypond-contributor \
41	lilypond-essay \
42	lilypond-extending \
43	lilypond-internals \
44	lilypond-learning \
45	lilypond-notation \
46	lilypond-snippets \
47	lilypond-usage \
48	lilypond-web \
49	music-glossary
50
51	USES= bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \	37	USES= bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \
52	gnome perl5 pkgconfig python:2.7	38	gnome perl5 pkgconfig python:2.7
53	USE_CXXSTD= c++11	39	USE_CXXSTD= c++11
		40	USE_GNOME= pango
		41	USE_PERL5= build
54	USE_TEX= latex texmf	42	USE_TEX= latex texmf
55	USE_PERL5= build
56	USE_GNOME= pango
57		43
58	MAKEFILE= GNUmakefile
59
60	GNU_CONFIGURE= yes	44	GNU_CONFIGURE= yes
61	CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \	45	CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
62	--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir	46	--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir
Lines 63-70 Link Here
63	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \	47	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
64	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}	48	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}
65		49
		50	MAKEFILE= GNUmakefile
66	ALL_TARGET= all	51	ALL_TARGET= all
67		52
		53	INFO= internals \
		54	lilypond-changes \
		55	lilypond-contributor \
		56	lilypond-essay \
		57	lilypond-extending \
		58	lilypond-internals \
		59	lilypond-learning \
		60	lilypond-notation \
		61	lilypond-snippets \
		62	lilypond-usage \
		63	lilypond-web \
		64	music-glossary
68	PLIST_SUB= DISTVERSION=${DISTVERSION}	65	PLIST_SUB= DISTVERSION=${DISTVERSION}
69		66
70	OPTIONS_DEFINE= NLS	67	OPTIONS_DEFINE= NLS