Fri Mar 7 19:38:58 2008 UTC ()
Update to 2.01.01a38:

All:

-	The Schily Makefile system has been enhanced to install
	the profiled version of the archives in a sub-directory "profiled".
	This is done via a new macro SUBINSDIR=

-	New autoconf test checks sizeof(time_t)

-	New autoconf test for the existence of stack_t and siginfo_t in signal.h

-	In order to allow better dealing with Solaris linker Mapfiles,
	a getfp() function (calling abort(3)) is created when it is not
	possible to implement this function because of compiler constraints.

-	Many other enhancements of the autoconfiguration have been a result
	of porting the Bourne Shell into the Schily Makefilesystem.

Libschily:

-	The schily *printf routines now correctly support the %j format (intmax_t)

-	getargs now first checks whether an argument can be a combination of
	several singlechar flags before starting to set values.

Libfind:

- 	libfind (used by sfind, bsh, star, mkisofs) fixed the -exec {} +
	implementation. Before the fix, it could core dump if the built-in
	xargs(1) would exactly fill up args to the size of ARG_MAX.

Libsiconv:

-	libsiconv/sic_nls.c modified to allow compilation with older GCC
	versions.

Cdrecord:

-	cdrecord/readcd/cdda2wav now support an enhanced /etc/default/cdrecord file
	with an additional parameter to specify the max. transfer size for a device.

-	CDR_FORCESPEED=any now works for cdrecord to switch off DMA speed test results

-	Make cdrecord compile again with a K&R compiler

-	Add a "blank emulation" layer to the BluRay driver too.

Cdda2wav (Maintained/enhanced by J�rg Schilling, originated by Heiko Ei゚feldt heiko@hexco.de):

-	cdrecord/readcd/cdda2wav now support an enhanced /etc/default/cdrecord file
	with an additional parameter to specify the max. transfer size for a device.

Readcd:

-	cdrecord/readcd/cdda2wav now support an enhanced /etc/default/cdrecord file
	with an additional parameter to specify the max. transfer size for a device.

Mkisofs (Maintained/enhanced by J�rg Schilling since 1997, originated by Eric Youngdale):

-	Fixed a typo unides -> inodes

-	Mkisofs now gives better warning for files > 4 GB in hope it
	will no direct people to read the documentation.

-	superfluous definition for memmove() on memmove()-less platforms removed


(wiz)
diff -r1.31 -r1.32 pkgsrc/sysutils/cdrtools/Makefile
diff -r1.13 -r1.14 pkgsrc/sysutils/cdrtools/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/cdrtools/patches/patch-aa

cvs diff -r1.31 -r1.32 pkgsrc/sysutils/cdrtools/Makefile (switch to unified diff)

--- pkgsrc/sysutils/cdrtools/Makefile 2008/02/11 13:05:14 1.31
+++ pkgsrc/sysutils/cdrtools/Makefile 2008/03/07 19:38:58 1.32
@@ -1,145 +1,143 @@ @@ -1,145 +1,143 @@
1# $NetBSD: Makefile,v 1.31 2008/02/11 13:05:14 bjs Exp $ 1# $NetBSD: Makefile,v 1.32 2008/03/07 19:38:58 wiz Exp $
2 2
3DISTNAME= cdrtools-2.01.01a37 3DISTNAME= cdrtools-2.01.01a38
4PKGNAME= cdrtools-2.01.01.37 4PKGNAME= cdrtools-2.01.01.38
5PKGREVISION= 1 
6CATEGORIES= sysutils 5CATEGORIES= sysutils
7MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ 6MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html 10HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
12COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs 11COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs
13 12
14CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* 13CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]*
15 14
16PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
18 17
19.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
20 19
21WRKSRC= ${WRKDIR}/cdrtools-2.01.01 20WRKSRC= ${WRKDIR}/cdrtools-2.01.01
22USE_TOOLS+= gmake tbl 21USE_TOOLS+= gmake tbl
23 22
24.if ${LOCALBASE} != "/opt/schily" 23.if ${LOCALBASE} != "/opt/schily"
25BUILDLINK_TRANSFORM+= rmdir:/opt/schily 24BUILDLINK_TRANSFORM+= rmdir:/opt/schily
26.endif 25.endif
27 26
28# avoid picking up a bad ${ARCH} during the build 27# avoid picking up a bad ${ARCH} during the build
29MAKE_ENV+= ARCH="" 28MAKE_ENV+= ARCH=""
30MAKE_ENV+= MAKEPROG="gmake" 29MAKE_ENV+= MAKEPROG="gmake"
31MAKE_ENV+= COPTX=${CFLAGS:Q} 30MAKE_ENV+= COPTX=${CFLAGS:Q}
32MAKE_ENV+= LDOPTX=${LDFLAGS:Q} 31MAKE_ENV+= LDOPTX=${LDFLAGS:Q}
33MAKE_ENV+= INS_BASE=${PREFIX:Q} 32MAKE_ENV+= INS_BASE=${PREFIX:Q}
34 33
35# if we're using a gcc which is named gcc, we need to set CCOM=gcc 34# if we're using a gcc which is named gcc, we need to set CCOM=gcc
36# in MAKE_ENV so the make infrastructure picks the right options. 35# in MAKE_ENV so the make infrastructure picks the right options.
37.if !empty(CC:M*gcc*) 36.if !empty(CC:M*gcc*)
38MAKE_ENV+= CCOM="gcc" 37MAKE_ENV+= CCOM="gcc"
39.endif 38.endif
40 39
41# allow us to override the default /etc/default/cdrecord by patching 40# allow us to override the default /etc/default/cdrecord by patching
42# the documentation appropriately. Additionally, we also provide a 41# the documentation appropriately. Additionally, we also provide a
43# MESSAGE stating the reasons we do this, as required by the license. 42# MESSAGE stating the reasons we do this, as required by the license.
44CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf 43CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
45 44
46.if ${CDRECORD_CONF} != "/etc/default/cdrecord" 45.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
47MESSAGE_SRC+= MESSAGE.cdrecord.conf 46MESSAGE_SRC+= MESSAGE.cdrecord.conf
48MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} 47MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q}
49MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q} 48MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q}
50.endif 49.endif
51 50
52INSTALLATION_DIRS= bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \ 51INSTALLATION_DIRS= bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
53 share/doc/cdrtools/cdda2wav \ 52 share/doc/cdrtools/cdda2wav \
54 share/doc/cdrtools/cdrecord \ 53 share/doc/cdrtools/cdrecord \
55 share/doc/cdrtools/mkisofs 54 share/doc/cdrtools/mkisofs
56 55
57SUBST_CLASSES+= fix 56SUBST_CLASSES+= fix
58SUBST_STAGE.fix= post-patch 57SUBST_STAGE.fix= post-patch
59SUBST_FILES.fix= btcflash/btcflash.1 58SUBST_FILES.fix= btcflash/btcflash.1
60SUBST_FILES.fix+= cdrecord/cdrecord.1 59SUBST_FILES.fix+= cdrecord/cdrecord.1
61SUBST_FILES.fix+= cdrecord/defaults.c 60SUBST_FILES.fix+= cdrecord/defaults.c
62SUBST_FILES.fix+= mkisofs/diag/isoinfo.8 61SUBST_FILES.fix+= mkisofs/diag/isoinfo.8
63SUBST_FILES.fix+= readcd/readcd.1 62SUBST_FILES.fix+= readcd/readcd.1
64SUBST_FILES.fix+= scgcheck/scgcheck.1 63SUBST_FILES.fix+= scgcheck/scgcheck.1
65SUBST_SED.fix= -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g" 64SUBST_SED.fix= -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
66SUBST_MESSAGE.fix= Fixing paths. 65SUBST_MESSAGE.fix= Fixing paths.
67 66
68SUBST_CLASSES+= oss 67SUBST_CLASSES+= oss
69SUBST_STAGE.oss= post-patch 68SUBST_STAGE.oss= post-patch
70SUBST_FILES.oss= cdda2wav/local.cnf.in 69SUBST_FILES.oss= cdda2wav/local.cnf.in
71SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSSOUND},g" 70SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSSOUND},g"
72SUBST_MESSAGE.oss= Fixing OSS sound device path. 71SUBST_MESSAGE.oss= Fixing OSS sound device path.
73 72
74post-extract: 73post-extract:
75 ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly 74 ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
76 ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly 75 ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
77 76
78do-configure: 77do-configure:
79 cd ${WRKSRC}/RULES; \ 78 cd ${WRKSRC}/RULES; \
80 for suffix in netbsd-cc.rul netbsd-gcc.rul; do \ 79 for suffix in netbsd-cc.rul netbsd-gcc.rul; do \
81 if [ ! -f ${MACHINE}-$$suffix ]; then \ 80 if [ ! -f ${MACHINE}-$$suffix ]; then \
82 ln -sf i386-$$suffix ${MACHINE}-$$suffix; \ 81 ln -sf i386-$$suffix ${MACHINE}-$$suffix; \
83 fi; \ 82 fi; \
84 done 83 done
85 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} config 84 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} config
86  
87 85
88post-build: 86post-build:
89 cd ${WRKSRC}; \ 87 cd ${WRKSRC}; \
90 for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \ 88 for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \
91 tbl $${manpage} > $${manpage}.tmp; \ 89 tbl $${manpage} > $${manpage}.tmp; \
92 mv -f $${manpage}.tmp $${manpage}; \ 90 mv -f $${manpage}.tmp $${manpage}; \
93 done 91 done
94 92
95do-install: 93do-install:
96 for program in btcflash cdda2wav cdrecord mkisofs \ 94 for program in btcflash cdda2wav cdrecord mkisofs \
97 readcd scgcheck scgskeleton; do \ 95 readcd scgcheck scgskeleton; do \
98 cd ${WRKSRC}/$${program}; \ 96 cd ${WRKSRC}/$${program}; \
99 ${INSTALL_PROGRAM} OBJ/*/$${program} \ 97 ${INSTALL_PROGRAM} OBJ/*/$${program} \
100 ${DESTDIR}${PREFIX}/bin; \ 98 ${DESTDIR}${PREFIX}/bin; \
101 done 99 done
102 for program in btcflash cdda2wav cdrecord readcd scgcheck; do \ 100 for program in btcflash cdda2wav cdrecord readcd scgcheck; do \
103 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.1 \ 101 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.1 \
104 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ 102 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
105 done 103 done
106 for program in mkisofs; do \ 104 for program in mkisofs; do \
107 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 \ 105 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 \
108 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8; \ 106 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8; \
109 done 107 done
110 cd ${WRKSRC}/mkisofs/diag; \ 108 cd ${WRKSRC}/mkisofs/diag; \
111 for f in devdump isodebug isodump isoinfo isovfy; do \ 109 for f in devdump isodebug isodump isoinfo isovfy; do \
112 ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \ 110 ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \
113 ${INSTALL_MAN} $$f.8 \ 111 ${INSTALL_MAN} $$f.8 \
114 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \ 112 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
115 done 113 done
116 ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \ 114 ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \
117 ${DESTDIR}${PREFIX}/lib/siconv 115 ${DESTDIR}${PREFIX}/lib/siconv
118 ${RM} ${DESTDIR}${PREFIX}/lib/siconv/*mk 116 ${RM} ${DESTDIR}${PREFIX}/lib/siconv/*mk
119 ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \ 117 ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \
120 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdda2wav 118 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdda2wav
121 ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \ 119 ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \
122 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdrecord 120 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdrecord
123 ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \ 121 ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
124 ${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs 122 ${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs
125 123
126 124
127CONFIGURE_ENV+= librt=${NETBSDLIB.rt:U:Q} 125CONFIGURE_ENV+= librt=${NETBSDLIB.rt:U:Q}
128 126
129.if ${OPSYS} == "NetBSD" 127.if ${OPSYS} == "NetBSD"
130netbsd-posix-sched-check-cookie: netbsd-posix-sched-check 128netbsd-posix-sched-check-cookie: netbsd-posix-sched-check
131### 129###
132### Check for POSIX priority scheduling in NetBSD 130### Check for POSIX priority scheduling in NetBSD
133### 131###
134 132
135.PHONY: netbsd-posix-sched-check 133.PHONY: netbsd-posix-sched-check
136netbsd-posix-sched-check: 134netbsd-posix-sched-check:
137NETBSDLIB.rt!=\ 135NETBSDLIB.rt!=\
138 if ( /sbin/sysctl -n kern.posix_sched >/dev/null 2>&1 ); then \ 136 if ( /sbin/sysctl -n kern.posix_sched >/dev/null 2>&1 ); then \
139 lib=-lrt; \ 137 lib=-lrt; \
140 fi || ${TRUE}; \ 138 fi || ${TRUE}; \
141 echo "$$lib" 139 echo "$$lib"
142.endif 140.endif
143 141
144.include "../../mk/oss.buildlink3.mk" 142.include "../../mk/oss.buildlink3.mk"
145.include "../../mk/bsd.pkg.mk" 143.include "../../mk/bsd.pkg.mk"

cvs diff -r1.13 -r1.14 pkgsrc/sysutils/cdrtools/distinfo (switch to unified diff)

--- pkgsrc/sysutils/cdrtools/distinfo 2008/02/11 13:05:14 1.13
+++ pkgsrc/sysutils/cdrtools/distinfo 2008/03/07 19:38:58 1.14
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.13 2008/02/11 13:05:14 bjs Exp $ 1$NetBSD: distinfo,v 1.14 2008/03/07 19:38:58 wiz Exp $
2 2
3SHA1 (cdrtools-2.01.01a37.tar.bz2) = c6bbce4959a12c81a5944d7896959077002851b5 3SHA1 (cdrtools-2.01.01a38.tar.bz2) = 44fb96d5f39abd1ecf79309de44d74edfbc77e39
4RMD160 (cdrtools-2.01.01a37.tar.bz2) = d8d7b5e411dbaf371c67179443c1ba6517110ab6 4RMD160 (cdrtools-2.01.01a38.tar.bz2) = 6242ba207ec4434934005337e2507ccb44ba5a4f
5Size (cdrtools-2.01.01a37.tar.bz2) = 1667934 bytes 5Size (cdrtools-2.01.01a38.tar.bz2) = 1665727 bytes
6SHA1 (patch-aa) = d0c9ad53f4bd45fc4fd9680436ffceaf9f10f92f 6SHA1 (patch-aa) = 7920f2d208ccee84d7de0674590ebe8d7cd11828
7SHA1 (patch-ab) = 04a52760204f266ab42ec3eb19fc1e4c82546617 7SHA1 (patch-ab) = 04a52760204f266ab42ec3eb19fc1e4c82546617
8SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f 8SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
9SHA1 (patch-ad) = ef1413689b9d6f0f47f80840f20af3edd34159dd 9SHA1 (patch-ad) = ef1413689b9d6f0f47f80840f20af3edd34159dd
10SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18 10SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
11SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336 11SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336
12SHA1 (patch-aj) = 28bc6a616647a895b6f42566080faf5c1173d698 12SHA1 (patch-aj) = 28bc6a616647a895b6f42566080faf5c1173d698
13SHA1 (patch-ba) = 58b32b4b211fe620c57f510e1804f91d1b52fd28 13SHA1 (patch-ba) = 58b32b4b211fe620c57f510e1804f91d1b52fd28
14SHA1 (patch-bb) = 5d5f21b5d026df11245409c708534fe57886d3ff 14SHA1 (patch-bb) = 5d5f21b5d026df11245409c708534fe57886d3ff
15SHA1 (patch-cf) = a2b4f0dfe4a524451774ba2d29210f9cf7125d12 15SHA1 (patch-cf) = a2b4f0dfe4a524451774ba2d29210f9cf7125d12
16SHA1 (patch-cg) = ff31244101639c8624b858e1404805205926a879 16SHA1 (patch-cg) = ff31244101639c8624b858e1404805205926a879
17SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46 17SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
18SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021 18SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021
19SHA1 (patch-cj) = 6be6bb13345a5bfe8c2f9cce6090b40e7b44a258 19SHA1 (patch-cj) = 6be6bb13345a5bfe8c2f9cce6090b40e7b44a258

cvs diff -r1.4 -r1.5 pkgsrc/sysutils/cdrtools/patches/Attic/patch-aa (switch to unified diff)

--- pkgsrc/sysutils/cdrtools/patches/Attic/patch-aa 2008/02/11 13:05:14 1.4
+++ pkgsrc/sysutils/cdrtools/patches/Attic/patch-aa 2008/03/07 19:38:58 1.5
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1--- conf/configure.orig 2008-02-11 07:56:04.000000000 -0500 1$NetBSD: patch-aa,v 1.5 2008/03/07 19:38:58 wiz Exp $
2+++ conf/configure 2008-02-11 07:56:33.000000000 -0500 2
3@@ -14378,7 +14378,7 @@ 3--- conf/configure.orig 2008-02-24 16:21:13.000000000 +0000
 4+++ conf/configure 2008-03-07 19:07:14.000000000 +0000
 5@@ -14703,7 +14703,7 @@
4  6
5 ; return 0; } 7 ; return 0; }
6 EOF 8 EOF
7-if { (eval echo configure:14382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 9-if { (eval echo configure:14707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8+if { (eval echo configure:14382: \"$ac_link\") 1>&5; (eval "$ac_link $librt") 2>&5; } && test -s conftest${ac_exeext}; then 10+if { (eval echo configure:14707: \"$ac_link\") 1>&5; (eval "$ac_link $librt") 2>&5; } && test -s conftest${ac_exeext}; then
9 rm -rf conftest* 11 rm -rf conftest*
10 eval "ac_cv_func_$ac_func=yes" 12 eval "ac_cv_func_$ac_func=yes"
11 else 13 else
12@@ -14392,6 +14392,7 @@ 14@@ -14717,6 +14717,7 @@
13  15
14 if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 16 if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15 echo "$ac_t""yes" 1>&6 17 echo "$ac_t""yes" 1>&6
16+ lib_rt="$librt" 18+ lib_rt="$librt"
17 ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 19 ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
18 cat >> confdefs.h <<EOF 20 cat >> confdefs.h <<EOF
19 #define $ac_tr_func 1 21 #define $ac_tr_func 1