ok? Index: Makefile =================================================================== RCS file: /cvs/ports/lang/eltclsh/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 28 Apr 2012 20:20:15 -0000 1.24 +++ Makefile 28 Apr 2012 22:01:26 -0000 @@ -2,8 +2,7 @@ COMMENT = Libedit interface to Tcl/Tk interpreters -DISTNAME = eltclsh-1.9 -REVISION= 6 +DISTNAME = eltclsh-1.12 CATEGORIES = lang x11 MASTER_SITES = http://www.openrobots.org/distfiles/eltclsh/ @@ -24,17 +23,28 @@ SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu +AUTOMAKE_VERSION = 1.11 +AUTOCONF_VERSION = 2.65 CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} CONFIGURE_ENV = MKDEP=/bin/false USE_GMAKE = Yes USE_LIBTOOL = Yes -FAKE_FLAGS = "ELTCL_LIBRARY=${WRKINST}${PREFIX}/share/eltcl" +FAKE_FLAGS = "ELTCL_LIBRARY=${WRKINST}${PREFIX}/lib/eltcl" NO_REGRESS = Yes LIB_DEPENDS += ${MODTK_LIB_DEPENDS} +BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/libtool + WANTLIB += ${MODTK_WANTLIB} + +pre-configure: + @cd ${WRKSRC} && \ + env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/eltclsh/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 30 Aug 2008 13:54:57 -0000 1.6 +++ distinfo 28 Apr 2012 22:01:26 -0000 @@ -1,5 +1,5 @@ -MD5 (eltclsh-1.9.tar.gz) = /kN/So5a0QIZd42sYIa9XA== -RMD160 (eltclsh-1.9.tar.gz) = i+4CiLxFiEW1OEJyFk30ji5+CwM= -SHA1 (eltclsh-1.9.tar.gz) = TIX8aSfD/ENZMW6SZUYKh0eXKg0= -SHA256 (eltclsh-1.9.tar.gz) = jzPI91FKVdQB8Tv0OdBGVc0GeMdbdsnvcRKXK74R0cY= -SIZE (eltclsh-1.9.tar.gz) = 342659 +MD5 (eltclsh-1.12.tar.gz) = f+FDlP4DuIrnjQtoI8ujPA== +RMD160 (eltclsh-1.12.tar.gz) = vVCR2IDbeCt/sg8385EffDPTKAM= +SHA1 (eltclsh-1.12.tar.gz) = acJf96kDPmgpH1QyVSelBTWBF+o= +SHA256 (eltclsh-1.12.tar.gz) = 75GlppHX8BQ+hsez2tlw30WPGqPNhqo8evKx0QE6TGk= +SIZE (eltclsh-1.12.tar.gz) = 244359 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 23 Oct 2010 21:49:06 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2010/10/23 21:49:06 naddy Exp $ ---- Makefile.in.orig Sat Oct 23 19:50:38 2010 -+++ Makefile.in Sat Oct 23 19:51:16 2010 -@@ -65,7 +65,7 @@ all depends: $(config_files) $(config_headers) doc - clean: - $(make_subdirs) - --install: $(config_files) install-doc install-catdoc -+install: $(config_files) install-doc - $(make_subdirs) - - -@@ -74,7 +74,7 @@ install: $(config_files) install-doc install-catdoc - MAN= eltclsh.1 - CATMAN= ${MAN:=.cat} - --doc: ${CATMAN} -+doc: - - %.cat: % - @if test "X${GROFF}" != "X"; then \ Index: patches/patch-config_mk_in =================================================================== RCS file: patches/patch-config_mk_in diff -N patches/patch-config_mk_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-config_mk_in 28 Apr 2012 22:01:26 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ + +--- config.mk.in.orig Sat Apr 28 22:59:37 2012 ++++ config.mk.in Sat Apr 28 22:59:18 2012 +@@ -62,6 +62,7 @@ + HAS_TK= @HAS_TK@ + TK_CPPFLAGS= @TK_INCLUDE_SPEC@ + TK_LDFLAGS= @TK_LIB_SPEC@ ++TK_LIBS= @TK_LIBS@ + + EL_CPPFLAGS= @EL_CPPFLAGS@ + EL_LDFLAGS= @EL_LIB_SPEC@ Index: patches/patch-m4_robots_m4 =================================================================== RCS file: patches/patch-m4_robots_m4 diff -N patches/patch-m4_robots_m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-m4_robots_m4 28 Apr 2012 22:01:26 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ + +--- m4/robots.m4.orig Sat Apr 28 22:40:41 2012 ++++ m4/robots.m4 Sat Apr 28 22:40:53 2012 +@@ -273,7 +273,7 @@ + AC_MSG_CHECKING([for tcl library]) + AC_LANG([C]) + ac_tmp_cppflags=$CPPFLAGS; CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC}" +- ac_tmp_ldflags=$LDFLAGS; LDFLAGS="${LDFLAGS} ${TCL_LIB_SPEC}" ++ ac_tmp_ldflags=$LDFLAGS; LDFLAGS="${LDFLAGS} ${TCL_LIB_SPEC} ${TCL_LIBS}" + AC_TRY_LINK([#include "$tcl_test_include"], [Tcl_Interp *i; Tcl_Init(i);],[ + AC_MSG_RESULT([${TCL_LIB_SPEC}]) + ],[ +@@ -369,7 +369,7 @@ + ac_tmp_cppflags=$CPPFLAGS; + ac_tmp_ldflags=$LDFLAGS; + CPPFLAGS="${CPPFLAGS} ${TK_INCLUDE_SPEC} ${TCL_INCLUDE_SPEC}" +- LDFLAGS="${LDFLAGS} ${TK_LIB_SPEC} ${TCL_LIB_SPEC}" ++ LDFLAGS="${LDFLAGS} ${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS} ${TCL_LIBS}" + AC_TRY_LINK([#include "$tk_test_include"], [Tcl_Interp *i; Tk_Init(i);],[ + AC_MSG_RESULT([${TK_LIB_SPEC}]) + ],[ Index: patches/patch-src_Makefile_in =================================================================== RCS file: patches/patch-src_Makefile_in diff -N patches/patch-src_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Makefile_in 28 Apr 2012 22:01:26 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +--- src/Makefile.in.orig Thu Jun 16 17:17:42 2011 ++++ src/Makefile.in Sat Apr 28 23:10:31 2012 +@@ -40,7 +40,7 @@ + bindir= @bindir@ + libdir= @libdir@ + datarootdir= @datarootdir@ +-datadir= @datadir@/eltcl ++datadir= @libdir@/eltcl + + libobjs= @LIBOBJS@ + +@@ -90,7 +90,8 @@ + + $(ELWISH): $(elwishobjs) $(commonobjs) + $(LTLD) -o $@ $(CFLAGS) $(elwishobjs) $(commonobjs) \ +- $(LDFLAGS) $(TCL_LDFLAGS) $(TK_LDFLAGS) $(EL_LDFLAGS) ++ $(LDFLAGS) $(TCL_LDFLAGS) $(TK_LDFLAGS) $(EL_LDFLAGS) \ ++ $(TK_LIBS) + + # package - Tcl and libtool don't cohabit well + # Index: patches/patch-src_elwish_c =================================================================== RCS file: /cvs/ports/lang/eltclsh/patches/patch-src_elwish_c,v retrieving revision 1.2 diff -u -r1.2 patch-src_elwish_c --- patches/patch-src_elwish_c 3 Apr 2004 09:30:22 -0000 1.2 +++ patches/patch-src_elwish_c 28 Apr 2012 22:01:26 -0000 @@ -1,12 +1,13 @@ -$OpenBSD: patch-src_elwish_c,v 1.2 2004/04/03 09:30:22 matthieu Exp $ ---- src/elwish.c.orig 2003-09-27 19:14:21.000000000 +0200 -+++ src/elwish.c 2004-04-03 11:23:11.000000000 +0200 -@@ -77,9 +77,6 @@ elWishAppInit(ElTclInterpInfo *iinfo) +$OpenBSD$ + +--- src/elwish.c.orig Thu Jun 16 17:17:42 2011 ++++ src/elwish.c Sat Apr 28 22:42:13 2012 +@@ -74,9 +74,6 @@ /* change the rc file */ - Tcl_SetVar(iinfo->interp, "tcl_rcFileName", ".elwishrc", TCL_GLOBAL_ONLY); + Tcl_SetVar(interp, "tcl_rcFileName", "~/.elwishrc", TCL_GLOBAL_ONLY); - /* I hate that stupid empty window you get after Tk_Init() */ -- Tcl_Eval(iinfo->interp, "wm withdraw ."); +- Tcl_Eval(interp, "wm withdraw ."); - return TCL_OK; } Index: patches/patch-tcl_Makefile_in =================================================================== RCS file: patches/patch-tcl_Makefile_in diff -N patches/patch-tcl_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tcl_Makefile_in 28 Apr 2012 22:01:26 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +--- tcl/Makefile.in.orig Thu Jun 16 17:17:42 2011 ++++ tcl/Makefile.in Sat Apr 28 23:20:45 2012 +@@ -36,8 +36,9 @@ + srcdir= @srcdir@ + + prefix= @prefix@ ++exec_prefix= @exec_prefix@ + datarootdir= @datarootdir@ +-datadir= @datadir@/eltcl ++datadir= @libdir@/eltcl + + VPATH= $(srcdir) + Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PFRAG.shared 28 Apr 2012 22:01:26 -0000 @@ -0,0 +1,2 @@ +@comment $OpenBSD$ +lib/eltcl/libeltclsh.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/eltclsh/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 23 Oct 2010 21:49:06 -0000 1.4 +++ pkg/PLIST 28 Apr 2012 22:01:26 -0000 @@ -1,9 +1,14 @@ @comment $OpenBSD: PLIST,v 1.4 2010/10/23 21:49:06 naddy Exp $ +%%SHARED%% @bin bin/eltclsh @bin bin/elwish +lib/eltcl/ +lib/eltcl/complete.tcl +lib/eltcl/init.tcl +lib/eltcl/libeltclsh.a +lib/eltcl/libeltclsh.la +lib/eltcl/pkgIndex.tcl +lib/eltcl/tools.tcl +lib/pkgconfig/ +lib/pkgconfig/eltclsh.pc @man man/man1/eltclsh.1 -share/eltcl/ -share/eltcl/complete.tcl -share/eltcl/init.tcl -share/eltcl/pkgIndex.tcl -share/eltcl/tools.tcl
-- Matthieu Herrb
