4 files changed, 32 insertions, 37 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 1a1f8e88df19..55c4c5ddf1d9 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clisp
-PORTVERSION=	2.44.1
-PORTREVISION=	1
+PORTVERSION=	2.47
 CATEGORIES=	lang lisp
 MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION}
 
@@ -19,7 +18,6 @@ LIB_DEPENDS=	readline.5:${PORTSDIR}/devel/readline \
 		sigsegv.0:${PORTSDIR}/devel/libsigsegv
 
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_GHOSTSCRIPT_BUILD=	yes
 WANT_GNOME=	yes
 HAS_CONFIGURE=	yes
@@ -71,6 +69,14 @@ PLIST_SUB+=	${mod}="@comment "
 .   endif
 .endfor
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 .if defined(WITH_BDB)
 USE_BDB=	43+
 CONFIGURE_ARGS+=--with-module=berkeley-db
@@ -147,15 +153,6 @@ CONFIGURE_ARGS+=--with-module=zlib
 .endif
 
 post-patch:
-.if ${ARCH} == "amd64"
-# Override CONFIGURE_TARGET (amd64 -> x86_64) in configure scripts.
-	@${REINPLACE_CMD} -e \
-		"s|^subdir_configure_args='|&--build=${CONFIGURE_TARGET}|;" \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		"s|^module_configure_flags='|&--build=${CONFIGURE_TARGET}|" \
-		${WRKSRC}/src/makemake.in
-.endif
 .if defined(WITH_ORACLE)
 	@${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|-lcompat ${PTHREAD_LIBS}|' \
 		${WRKSRC}/modules/oracle/link.sh
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index f4044bfc5758..e78b46747c5b 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,3 +1,3 @@
-MD5 (clisp-2.44.1.tar.gz) = 75d933e82c611fd4e89fcb1072dce397
-SHA256 (clisp-2.44.1.tar.gz) = 4112ef1f4e1eb7640415a1b878357baea745e23dd045a6522b9ac0988d347766
-SIZE (clisp-2.44.1.tar.gz) = 8950346
+MD5 (clisp-2.47.tar.gz) = 5d8869962609c9593103379bfb2d532d
+SHA256 (clisp-2.47.tar.gz) = c7de1582be305bcb72683ffd242e267942ffe451d6f1e372f1e5cc9b42e98e6a
+SIZE (clisp-2.47.tar.gz) = 9175929
diff --git a/lang/clisp/files/patch-configure b/lang/clisp/files/patch-configure
index 3031d2869f26..36353e85e44f 100644
--- a/lang/clisp/files/patch-configure
+++ b/lang/clisp/files/patch-configure
@@ -1,7 +1,7 @@
---- ./configure.orig	Wed Dec 12 20:56:58 2007
-+++ ./configure	Mon Feb  4 14:53:22 2008
-@@ -380,22 +380,18 @@
-         passnextm=yes ;;
+--- configure.orig	2009-01-29 22:59:16.000000000 -0500
++++ configure	2009-01-29 23:01:58.000000000 -0500
+@@ -392,21 +392,17 @@
+         passnext=both ;;
  
        --elispdir=* | --elispdi=* | --elispd=* | --elisp=* | --elis=* | --eli=* | --el=*)
 -        subdir_configure_args="$subdir_configure_args $arg"
@@ -11,8 +11,7 @@
 -        subdir_configure_args="$subdir_configure_args $arg"
          makemake_args="$makemake_args --elispdir="
          prev=elispdir
-         passnext=yes
-         passnextm=yes ;;
+         passnext=both ;;
  
        --vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
 -        subdir_configure_args="$subdir_configure_args $arg"
@@ -22,4 +21,4 @@
 -        subdir_configure_args="$subdir_configure_args $arg"
          makemake_args="$makemake_args --vimdir="
          prev=vimdir
-         passnext=yes
+         passnext=both ;;
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 383681ad165e..ee54f2e33bee 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -94,7 +94,6 @@ lib/clisp/full/regexp.dvi
 %%CLX_MIT%%lib/clisp/full/translate.fas
 %%CLX_MIT%%lib/clisp/full/translate.lisp
 lib/clisp/full/uniname.o
-%%WILDCARD%%lib/clisp/full/wildcard.dvi
 %%WILDCARD%%lib/clisp/full/wildcard.o
 lib/clisp/full/width.o
 %%ZLIB%%lib/clisp/full/zlib.o
@@ -131,20 +130,20 @@ lib/clisp/linkkit/modules.c
 %%DATADIR%%/emacs/clisp-indent.el
 %%DATADIR%%/emacs/clisp-indent.lisp
 %%DATADIR%%/vim/lisp.vim
-share/locale/da/LC_MESSAGES/clisp.mo
-share/locale/da/LC_MESSAGES/clisplow.mo
-share/locale/de/LC_MESSAGES/clisp.mo
-share/locale/de/LC_MESSAGES/clisplow.mo
-share/locale/en/LC_MESSAGES/clisp.mo
-share/locale/en/LC_MESSAGES/clisplow.mo
-share/locale/es/LC_MESSAGES/clisp.mo
-share/locale/es/LC_MESSAGES/clisplow.mo
-share/locale/fr/LC_MESSAGES/clisp.mo
-share/locale/fr/LC_MESSAGES/clisplow.mo
-share/locale/nl/LC_MESSAGES/clisp.mo
-share/locale/nl/LC_MESSAGES/clisplow.mo
-share/locale/ru/LC_MESSAGES/clisp.mo
-share/locale/ru/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/da/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/da/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/de/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/de/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/en/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/en/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/es/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/es/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/clisplow.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/clisp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/clisplow.mo
 @dirrm %%DATADIR%%/vim
 @dirrm %%DATADIR%%/emacs
 @dirrm %%DATADIR%%