1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

Update to 2.4.9

Changes can be found here:
http://clisp.cvs.sourceforge.net/viewvc/clisp/clisp/src/NEWS?revision=clisp_2_49-2010-07-07

and more in the ChangeLog.

The new dynamic modules is not enabled for this port.

PR:		ports/148512
Submitted by:	Joseph S. Atkinson <jsa@wickedmachine.net> (maintainer)
This commit is contained in:
Wesley Shields 2010-07-12 14:17:13 +00:00
parent 6ba82fee64
commit 3c829e74ed
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=257694
5 changed files with 117 additions and 127 deletions

View File

@ -6,8 +6,7 @@
# #
PORTNAME= clisp PORTNAME= clisp
PORTVERSION= 2.48 PORTVERSION= 2.49
PORTREVISION= 4
CATEGORIES= lang lisp CATEGORIES= lang lisp
MASTER_SITES= GNU/${PORTNAME}/release/${PORTVERSION} MASTER_SITES= GNU/${PORTNAME}/release/${PORTVERSION}
@ -18,13 +17,16 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libavcall.a:${PORTSDIR}/devel/ffcall
LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline \ LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline \
sigsegv.2:${PORTSDIR}/devel/libsigsegv sigsegv.2:${PORTSDIR}/devel/libsigsegv
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/GNU-GPL
USE_ICONV= yes USE_ICONV= yes
USE_GHOSTSCRIPT_BUILD= yes USE_GHOSTSCRIPT_BUILD= yes
WANT_GNOME= yes WANT_GNOME= yes
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \ CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \ --elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
--docdir="${DOCSDIR}" --docdir="${DOCSDIR} --with-dynamic-modules=no"
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL} CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
# Complaints if the environment changes between build stages. # Complaints if the environment changes between build stages.
@ -52,7 +54,7 @@ OPTIONS= BDB "Build Berkeley Database module" off \
WILDCARD "Build wildcard matching module" on \ WILDCARD "Build wildcard matching module" on \
ZLIB "Build ZLib interface module " off ZLIB "Build ZLib interface module " off
MAN1= clisp.1 MAN1= clisp.1 clisp-link.1
SUB_FILES= pkg-message SUB_FILES= pkg-message
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -106,7 +108,7 @@ CONFIGURE_ARGS+=--with-module=clx/new-clx
.endif .endif
.if defined(WITH_DBUS) .if defined(WITH_DBUS)
LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+=--with-module=dbus CONFIGURE_ARGS+=--with-module=dbus
.endif .endif

View File

@ -1,3 +1,3 @@
MD5 (clisp-2.48.tar.gz) = d9019b5aace0f2226f4dc5f331bd90d8 MD5 (clisp-2.49.tar.gz) = de8c75f8e717f8ed047147923113ea70
SHA256 (clisp-2.48.tar.gz) = 104f28a7cf157097ec8b6b4934e6c930c59a0bf5e4a2ccf1af18d7ac7572fe52 SHA256 (clisp-2.49.tar.gz) = bd2f6252c681337c0b6aa949fae3f92d3202dee3998c98a88ec28c72b115e866
SIZE (clisp-2.48.tar.gz) = 9599162 SIZE (clisp-2.49.tar.gz) = 9823111

View File

@ -1,6 +1,6 @@
--- ./modules/postgresql/config.h.in.orig Thu Jan 12 14:56:07 2006 --- ./modules/postgresql/config.h.in.orig 2010-07-08 08:26:09.000000000 -0400
+++ ./modules/postgresql/config.h.in Mon Jun 26 17:59:45 2006 +++ ./modules/postgresql/config.h.in 2010-07-08 08:27:26.000000000 -0400
@@ -174,17 +174,11 @@ @@ -228,9 +228,6 @@
/* Define to 1 if you have the `PQgetResult' function. */ /* Define to 1 if you have the `PQgetResult' function. */
#undef HAVE_PQGETRESULT #undef HAVE_PQGETRESULT
@ -10,11 +10,13 @@
/* Define to 1 if you have the `PQgetvalue' function. */ /* Define to 1 if you have the `PQgetvalue' function. */
#undef HAVE_PQGETVALUE #undef HAVE_PQGETVALUE
/* Define to 1 if you have the `PQhost' function. */ @@ -240,9 +237,6 @@
#undef HAVE_PQHOST /* Define to 1 if you have the `PQinitOpenSSL' function. */
- #undef HAVE_PQINITOPENSSL
-/* Define to 1 if you have the `PQinitSSL' function. */ -/* Define to 1 if you have the `PQinitSSL' function. */
-#undef HAVE_PQINITSSL -#undef HAVE_PQINITSSL
-
/* Define to 1 if you have the `PQisBusy' function. */ /* Define to 1 if you have the `PQisBusy' function. */
#undef HAVE_PQISBUSY #undef HAVE_PQISBUSY

View File

@ -1,29 +1,11 @@
--- src/makemake.in.orig 2009-07-28 17:58:03.000000000 +0400 --- ./src/makemake.in.orig 2010-07-08 10:20:32.000000000 -0400
+++ src/makemake.in 2009-11-10 04:20:38.000000000 +0300 +++ ./src/makemake.in 2010-07-08 10:23:05.000000000 -0400
@@ -1930,7 +1930,7 @@ @@ -1917,7 +1917,7 @@
echol "psdir = ${PSDIR}" echol "psdir = ${PSDIR}"
echol "pdfdir = ${PDFDIR}" echol "pdfdir = ${PDFDIR}"
echol "libdir = ${LIBDIR}" echol "libdir = ${LIBDIR}"
-echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)" -echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)"
+echol "lisplibdir = \$(libdir)${NEXT_}clisp" +echol "lisplibdir = \$(libdir)${NEXT_}clisp"
if [ -n "$USE_GETTEXT" ] ; then test -n "$USE_GETTEXT" && echol "localedir = ${LOCALEDIR}"
echol "localedir = ${LOCALEDIR}" echol "elispdir = ${ELISPDIR}"
fi echol "vimdir = ${VIMDIR}"
@@ -2082,6 +2082,7 @@
echol '# Programs used by "make install":'
echol "INSTALL = ${INSTALL}"
echol "INSTALL_PROGRAM = ${INSTALL_PROGRAM}"
+echol "INSTALL_SCRIPT = ${INSTALL_SCRIPT}"
echol "INSTALL_DATA = ${INSTALL_DATA}"
echol
echol '# Programs used by "make distrib":'
@@ -3610,7 +3611,8 @@
echotab "mkdir \$(DESTDIR)\$(lisplibdir)/full"
echotab "for f in clisp-link linkkit/* base/* full/*; do \\"
echotab " case \$\$f in \\"
- echotab " */lisp${LEXE}|clisp-link) \$(INSTALL_PROGRAM) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f;; \\"
+ echotab " */lisp${LEXE}) \$(INSTALL_PROGRAM) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f;; \\"
+ echotab " clisp-link) \$(INSTALL_SCRIPT) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f;; \\"
echotab " *) \$(INSTALL_DATA) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f;; \\"
echotab " esac; \\"
echotab "done"

View File

@ -1,37 +1,12 @@
bin/clisp %%BDB%%lib/clisp/full/bdb.o
lib/clisp/base/calls.o
lib/clisp/base/gettext.o
lib/clisp/base/libnoreadline.a
lib/clisp/base/lisp.a
lib/clisp/base/lisp.run
lib/clisp/base/lispinit.mem
lib/clisp/base/localcharset.o
lib/clisp/base/makevars
lib/clisp/base/modules.h
lib/clisp/base/modules.o
lib/clisp/base/readline.o
lib/clisp/base/regex.o
lib/clisp/base/regexi.o
lib/clisp/base/regexp.dvi
lib/clisp/base/uniname.o
lib/clisp/base/width.o
lib/clisp/clisp-link
lib/clisp/data/Symbol-Table.text
lib/clisp/data/UnicodeDataFull.txt
%%CLX_MIT%%lib/clisp/full/attributes.fas %%CLX_MIT%%lib/clisp/full/attributes.fas
%%CLX_MIT%%lib/clisp/full/attributes.lisp %%CLX_MIT%%lib/clisp/full/attributes.lisp
%%BDB%%lib/clisp/full/bdb.o
%%CLX_MIT%%lib/clisp/full/buffer.fas %%CLX_MIT%%lib/clisp/full/buffer.fas
%%CLX_MIT%%lib/clisp/full/buffer.lisp %%CLX_MIT%%lib/clisp/full/buffer.lisp
%%CLX_MIT%%lib/clisp/full/bufmac.fas %%CLX_MIT%%lib/clisp/full/bufmac.fas
%%CLX_MIT%%lib/clisp/full/bufmac.lisp %%CLX_MIT%%lib/clisp/full/bufmac.lisp
lib/clisp/full/calls.o
%%CLX_MIT%%lib/clisp/full/clx.fas %%CLX_MIT%%lib/clisp/full/clx.fas
%%CLX_MIT%%lib/clisp/full/clx.lisp %%CLX_MIT%%lib/clisp/full/clx.lisp
%%CLX_NEW%%lib/clisp/full/clx.o
%%PARI%%lib/clisp/full/cpari.o
%%PCRE%%lib/clisp/full/cpcre.o
%%DBUS%%lib/clisp/full/dbus.o
%%CLX_MIT%%lib/clisp/full/depdefs.fas %%CLX_MIT%%lib/clisp/full/depdefs.fas
%%CLX_MIT%%lib/clisp/full/depdefs.lisp %%CLX_MIT%%lib/clisp/full/depdefs.lisp
%%CLX_MIT%%lib/clisp/full/dependent.fas %%CLX_MIT%%lib/clisp/full/dependent.fas
@ -40,99 +15,70 @@ lib/clisp/full/calls.o
%%CLX_MIT%%lib/clisp/full/describe.lisp %%CLX_MIT%%lib/clisp/full/describe.lisp
%%CLX_MIT%%lib/clisp/full/display.fas %%CLX_MIT%%lib/clisp/full/display.fas
%%CLX_MIT%%lib/clisp/full/display.lisp %%CLX_MIT%%lib/clisp/full/display.lisp
%%FASTCGI%%lib/clisp/full/fastcgi.o
%%FASTCGI%%lib/clisp/full/fastcgi_wrappers.o
%%CLX_MIT%%lib/clisp/full/fonts.fas %%CLX_MIT%%lib/clisp/full/fonts.fas
%%CLX_MIT%%lib/clisp/full/fonts.lisp %%CLX_MIT%%lib/clisp/full/fonts.lisp
%%WILDCARD%%lib/clisp/full/fnmatch.o
%%CLX_MIT%%lib/clisp/full/gcontext.fas %%CLX_MIT%%lib/clisp/full/gcontext.fas
%%CLX_MIT%%lib/clisp/full/gcontext.lisp %%CLX_MIT%%lib/clisp/full/gcontext.lisp
%%GDBM%%lib/clisp/full/gdbm.o
lib/clisp/full/gettext.o
%%CLX_MIT%%lib/clisp/full/graphics.fas %%CLX_MIT%%lib/clisp/full/graphics.fas
%%CLX_MIT%%lib/clisp/full/graphics.lisp %%CLX_MIT%%lib/clisp/full/graphics.lisp
%%GTK2%%lib/clisp/full/gtk.o
%%CLX_MIT%%lib/clisp/full/image.fas %%CLX_MIT%%lib/clisp/full/image.fas
%%CLX_MIT%%lib/clisp/full/image.lisp %%CLX_MIT%%lib/clisp/full/image.lisp
%%CLX_MIT%%lib/clisp/full/input.fas %%CLX_MIT%%lib/clisp/full/input.fas
%%CLX_MIT%%lib/clisp/full/input.lisp %%CLX_MIT%%lib/clisp/full/input.lisp
%%CLX_MIT%%lib/clisp/full/keysyms.fas %%CLX_MIT%%lib/clisp/full/keysyms.fas
%%CLX_MIT%%lib/clisp/full/keysyms.lisp %%CLX_MIT%%lib/clisp/full/keysyms.lisp
lib/clisp/full/libnoreadline.a
%%SVM%%lib/clisp/full/libsvm.o
lib/clisp/full/lisp.a
lib/clisp/full/lisp.run
lib/clisp/full/lispinit.mem
lib/clisp/full/localcharset.o
%%CLX_MIT%%lib/clisp/full/macros.fas %%CLX_MIT%%lib/clisp/full/macros.fas
%%CLX_MIT%%lib/clisp/full/macros.lisp %%CLX_MIT%%lib/clisp/full/macros.lisp
lib/clisp/full/makevars
%%CLX_MIT%%lib/clisp/full/manager.fas %%CLX_MIT%%lib/clisp/full/manager.fas
%%CLX_MIT%%lib/clisp/full/manager.lisp %%CLX_MIT%%lib/clisp/full/manager.lisp
lib/clisp/full/modules.h
lib/clisp/full/modules.o
%%ORACLE%%lib/clisp/full/oiface.o
%%ORACLE%%lib/clisp/full/oracle.o
%%ORACLE%%lib/clisp/full/orafns.o
%%CLX_MIT%%lib/clisp/full/package.fas %%CLX_MIT%%lib/clisp/full/package.fas
%%CLX_MIT%%lib/clisp/full/package.lisp %%CLX_MIT%%lib/clisp/full/package.lisp
%%PARI%%lib/clisp/full/pari.o
%%PGSQL%%lib/clisp/full/postgresql.o
%%RAWSOCK%%lib/clisp/full/rawsock.o
lib/clisp/full/readline.o
lib/clisp/full/regex.o
lib/clisp/full/regexi.o
lib/clisp/full/regexp.dvi
%%CLX_MIT%%lib/clisp/full/requests.fas %%CLX_MIT%%lib/clisp/full/requests.fas
%%CLX_MIT%%lib/clisp/full/requests.lisp %%CLX_MIT%%lib/clisp/full/requests.lisp
%%CLX_MIT%%lib/clisp/full/resource.fas %%CLX_MIT%%lib/clisp/full/resource.fas
%%CLX_MIT%%lib/clisp/full/resource.lisp %%CLX_MIT%%lib/clisp/full/resource.lisp
%%CLX_MIT%%lib/clisp/full/shape.fas %%CLX_MIT%%lib/clisp/full/shape.fas
%%CLX_MIT%%lib/clisp/full/shape.lisp %%CLX_MIT%%lib/clisp/full/shape.lisp
%%SVM%%lib/clisp/full/svm.so
%%CLX_MIT%%lib/clisp/full/text.fas %%CLX_MIT%%lib/clisp/full/text.fas
%%CLX_MIT%%lib/clisp/full/text.lisp %%CLX_MIT%%lib/clisp/full/text.lisp
%%CLX_MIT%%lib/clisp/full/trace.fas %%CLX_MIT%%lib/clisp/full/trace.fas
%%CLX_MIT%%lib/clisp/full/trace.lisp %%CLX_MIT%%lib/clisp/full/trace.lisp
%%CLX_MIT%%lib/clisp/full/translate.fas %%CLX_MIT%%lib/clisp/full/translate.fas
%%CLX_MIT%%lib/clisp/full/translate.lisp %%CLX_MIT%%lib/clisp/full/translate.lisp
lib/clisp/full/uniname.o %%CLX_NEW%%lib/clisp/full/clx.o
%%WILDCARD%%lib/clisp/full/wildcard.o
lib/clisp/full/width.o
%%ZLIB%%lib/clisp/full/zlib.o
lib/clisp/linkkit/clisp.h
lib/clisp/linkkit/modprep.lisp
lib/clisp/linkkit/modules.c
%%DOCSDIR%%/ANNOUNCE
%%DOCSDIR%%/COPYRIGHT
%%DOCSDIR%%/GNU-GPL
%%DOCSDIR%%/MAGIC.add
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/README
%%DOCSDIR%%/README.de
%%DOCSDIR%%/README.es
%%DOCSDIR%%/SUMMARY
%%DOCSDIR%%/clisp.dvi
%%DOCSDIR%%/clisp.html
%%DOCSDIR%%/clisp.pdf
%%DOCSDIR%%/clisp.ps
%%DOCSDIR%%/doc/CLOS-guide.txt
%%DOCSDIR%%/doc/LISP-tutorial.txt
%%DOCSDIR%%/doc/clisp.1
%%DOCSDIR%%/doc/clisp.dvi
%%DOCSDIR%%/doc/clisp.html
%%DOCSDIR%%/doc/clisp.pdf
%%DOCSDIR%%/doc/clisp.png
%%DOCSDIR%%/doc/clisp.ps
%%DOCSDIR%%/doc/impnotes.css
%%DOCSDIR%%/doc/impnotes.html
%%DATADIR%%/emacs/clhs.el %%DATADIR%%/emacs/clhs.el
%%DATADIR%%/emacs/clisp-coding.el %%DATADIR%%/emacs/clisp-coding.el
%%DATADIR%%/emacs/clisp-ffi.el %%DATADIR%%/emacs/clisp-ffi.el
%%DATADIR%%/emacs/clisp-indent.el %%DATADIR%%/emacs/clisp-indent.el
%%DATADIR%%/emacs/clisp-indent.lisp %%DATADIR%%/emacs/clisp-indent.lisp
%%DATADIR%%/vim/lisp.vim %%DATADIR%%/vim/lisp.vim
share/aclocal/clisp.m4 %%DBUS%%lib/clisp/full/dbus.o
%%DOCSDIR%%/ANNOUNCE
%%DOCSDIR%%/CLOS-guide.txt
%%DOCSDIR%%/COPYRIGHT
%%DOCSDIR%%/GNU-GPL
%%DOCSDIR%%/LISP-tutorial.txt
%%DOCSDIR%%/MAGIC.add
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/README
%%DOCSDIR%%/README.de
%%DOCSDIR%%/README.es
%%DOCSDIR%%/SUMMARY
%%DOCSDIR%%/clisp-link.1
%%DOCSDIR%%/clisp-link.html
%%DOCSDIR%%/clisp-link.pdf
%%DOCSDIR%%/clisp-link.ps
%%DOCSDIR%%/clisp.1
%%DOCSDIR%%/clisp.html
%%DOCSDIR%%/clisp.pdf
%%DOCSDIR%%/clisp.png
%%DOCSDIR%%/clisp.ps
%%DOCSDIR%%/impnotes.css
%%DOCSDIR%%/impnotes.html
%%FASTCGI%%lib/clisp/full/fastcgi.o
%%FASTCGI%%lib/clisp/full/fastcgi_wrappers.o
%%GDBM%%lib/clisp/full/gdbm.o
%%GTK2%%lib/clisp/full/gtk.o
%%NLS%%share/locale/da/LC_MESSAGES/clisp.mo %%NLS%%share/locale/da/LC_MESSAGES/clisp.mo
%%NLS%%share/locale/da/LC_MESSAGES/clisplow.mo %%NLS%%share/locale/da/LC_MESSAGES/clisplow.mo
%%NLS%%share/locale/de/LC_MESSAGES/clisp.mo %%NLS%%share/locale/de/LC_MESSAGES/clisp.mo
@ -147,13 +93,71 @@ share/aclocal/clisp.m4
%%NLS%%share/locale/nl/LC_MESSAGES/clisplow.mo %%NLS%%share/locale/nl/LC_MESSAGES/clisplow.mo
%%NLS%%share/locale/ru/LC_MESSAGES/clisp.mo %%NLS%%share/locale/ru/LC_MESSAGES/clisp.mo
%%NLS%%share/locale/ru/LC_MESSAGES/clisplow.mo %%NLS%%share/locale/ru/LC_MESSAGES/clisplow.mo
@dirrm %%DATADIR%%/vim %%ORACLE%%lib/clisp/full/oiface.o
@dirrm %%DATADIR%%/emacs %%ORACLE%%lib/clisp/full/oracle.o
@dirrm %%DATADIR%% %%ORACLE%%lib/clisp/full/orafns.o
@dirrm %%DOCSDIR%%/doc %%PARI%%lib/clisp/full/cpari.o
@dirrm %%DOCSDIR%% %%PARI%%lib/clisp/full/pari.o
%%PCRE%%lib/clisp/full/cpcre.o
%%PGSQL%%lib/clisp/full/postgresql.o
%%RAWSOCK%%lib/clisp/full/rawsock.o
%%SVM%%lib/clisp/full/libsvm.o
%%SVM%%lib/clisp/full/svm.so
%%WILDCARD%%lib/clisp/full/wildcard.o
%%ZLIB%%lib/clisp/full/zlib.o
bin/clisp
bin/clisp-link
lib/clisp/base/bogomips.o
lib/clisp/base/calls.o
lib/clisp/base/gettext.o
lib/clisp/base/libgnu_cl.a
lib/clisp/base/libgnu_rx.a
lib/clisp/base/libgnu_sc.a
lib/clisp/base/libnoreadline.a
lib/clisp/base/lisp.a
lib/clisp/base/lisp.run
lib/clisp/base/lispinit.mem
lib/clisp/base/makevars
lib/clisp/base/modules.h
lib/clisp/base/modules.o
lib/clisp/base/readline.o
lib/clisp/base/regexi.o
lib/clisp/build-aux/arg-nonnull.h
lib/clisp/build-aux/c++defs.h
lib/clisp/build-aux/config.guess
lib/clisp/build-aux/config.rpath
lib/clisp/build-aux/config.sub
lib/clisp/build-aux/depcomp
lib/clisp/build-aux/warn-on-use.h
lib/clisp/data/Symbol-Table.text
lib/clisp/data/UnicodeDataFull.txt
lib/clisp/full/bogomips.o
lib/clisp/full/calls.o
lib/clisp/full/gettext.o
lib/clisp/full/libgnu_cl.a
lib/clisp/full/libgnu_rx.a
lib/clisp/full/libgnu_sc.a
lib/clisp/full/libgnu_wc.a
lib/clisp/full/libnoreadline.a
lib/clisp/full/lisp.a
lib/clisp/full/lisp.run
lib/clisp/full/lispinit.mem
lib/clisp/full/makevars
lib/clisp/full/modules.h
lib/clisp/full/modules.o
lib/clisp/full/readline.o
lib/clisp/full/regexi.o
lib/clisp/linkkit/clisp.h
lib/clisp/linkkit/modprep.lisp
lib/clisp/linkkit/modules.c
share/aclocal/clisp.m4
@dirrm lib/clisp/linkkit @dirrm lib/clisp/linkkit
@dirrm lib/clisp/full @dirrm lib/clisp/full
@dirrm lib/clisp/data @dirrm lib/clisp/data
@dirrm lib/clisp/build-aux
@dirrm lib/clisp/base @dirrm lib/clisp/base
@dirrm lib/clisp @dirrm lib/clisp
@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/vim
@dirrm %%DATADIR%%/emacs
@dirrm %%DATADIR%%