On 2009/10/10 19:42, Stuart Henderson wrote:
> this updates libslang and dependencies to something from the
> century of the fruitbat.
>
> linleech seems to be dead upstream and doesn't work with
> newer S-Lang so unless anyone screams I plan to zap it.
>
> test reports welcome.
missed a cvs rm; devel/libslang/patches/patch-autoconf_configure_in
needs to go.
> Index: editors/jed/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/jed/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- editors/jed/Makefile 10 Aug 2009 06:31:08 -0000 1.30
> +++ editors/jed/Makefile 10 Oct 2009 18:40:11 -0000
> @@ -2,28 +2,28 @@
>
> COMMENT= text editor
>
> -DISTNAME= jed-0.99-16
> -PKGNAME= jed-0.99.16p0
> +DISTNAME= jed-0.99-18
> +PKGNAME= ${DISTNAME:S/0.99-/0.99./}
> CATEGORIES= editors
> MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.99/ \
> ftp://ftp.ntua.gr/pub/lang/slang/jed/v0.99/ \
> - ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/
> + ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v0.99/
>
> -HOMEPAGE= http://space.mit.edu/~davis/jed/
> +HOMEPAGE= http://www.jedsoft.org/jed/
>
> -LIB_DEPENDS= slang.>=14::devel/libslang
> +LIB_DEPENDS= slang.>=15::devel/libslang
>
> -# GPL
> +# GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> WANTLIB= c m termcap util
>
> -FAKE= lib
> CONFIGURE_STYLE= gnu
> +CONFIGURE_ARGS= --with-slang=${LOCALBASE}
> CONFIGURE_ENV+= JED_ROOT="${PREFIX}/lib/jed"
> -CONFIGURE_ENV+= DEPBASE=${DEPBASE}
> +#CONFIGURE_ENV+= DEPBASE=${DEPBASE}
>
> FLAVORS= no_x11
> FLAVOR?=
> @@ -33,7 +33,7 @@ ALL_TARGET= all getmail
> .else
> USE_X11= Yes
> ALL_TARGET= all getmail xjed
> -WANTLIB+= X11 Xext Xft Xrender freetype pthread-stubs xcb
> +WANTLIB+= X11 Xext Xft Xrender freetype
> .endif
>
> NO_REGRESS= Yes
> Index: editors/jed/distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/jed/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- editors/jed/distinfo 5 Apr 2007 15:38:07 -0000 1.4
> +++ editors/jed/distinfo 10 Oct 2009 18:40:11 -0000
> @@ -1,5 +1,5 @@
> -MD5 (jed-0.99-16.tar.gz) = 5Q6V2NYmRFy3ePre46KkfQ==
> -RMD160 (jed-0.99-16.tar.gz) = ZkplhCpRKFwSdMOGoqRZmgJAEjY=
> -SHA1 (jed-0.99-16.tar.gz) = VUdUroasffO8SwwP0pddT6eYhmc=
> -SHA256 (jed-0.99-16.tar.gz) = vCO5cktVd7uvdrJ5azkxIj2RbBv7PsTqjcfMZfZ/OYI=
> -SIZE (jed-0.99-16.tar.gz) = 845360
> +MD5 (jed-0.99-18.tar.gz) = LTcQRgSMx70Whu5wwArUlQ==
> +RMD160 (jed-0.99-18.tar.gz) = 2FMEJL9C7kHz37g85BUe6h39dE8=
> +SHA1 (jed-0.99-18.tar.gz) = l0e7y8+nUmBprwo921C52TAUDFs=
> +SHA256 (jed-0.99-18.tar.gz) = 2qzG9coJRHFgLchlD3bRAAMJiFTxaUn+37oAOqP1PDs=
> +SIZE (jed-0.99-18.tar.gz) = 971456
> Index: editors/jed/patches/patch-configure
> ===================================================================
> RCS file: editors/jed/patches/patch-configure
> diff -N editors/jed/patches/patch-configure
> --- editors/jed/patches/patch-configure 19 Apr 2005 09:41:42 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1 2005/04/19 09:41:42 espie Exp $
> ---- configure.orig Tue Apr 19 11:06:54 2005
> -+++ configure Tue Apr 19 11:07:22 2005
> -@@ -2632,6 +2632,7 @@ test "x$exec" = "xNONE" && exec="$ac_def
> - test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
> - JD_Search_Dirs="$JD_Search_Dirs \
> - $includedir,$libdir \
> -+ $DEPBASE/include,$DEPBASE/lib \
> - /usr/local/include,/usr/local/lib \
> - /usr/include,/usr/lib \
> - /usr/include/slang,/usr/lib \
> Index: editors/jed/patches/patch-lib_jed_rc
> ===================================================================
> RCS file: /cvs/ports/editors/jed/patches/patch-lib_jed_rc,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lib_jed_rc
> --- editors/jed/patches/patch-lib_jed_rc 19 Apr 2005 09:41:42 -0000
> 1.3
> +++ editors/jed/patches/patch-lib_jed_rc 10 Oct 2009 18:40:11 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-lib_jed_rc,v 1.3 2005/04/19 09:41:42 espie Exp $
> ---- lib/jed.rc.orig Sun Oct 20 08:55:30 2002
> -+++ lib/jed.rc Tue Apr 19 11:04:41 2005
> -@@ -152,7 +152,7 @@ CASE_SEARCH = 0; % zero turns off cas
> +--- lib/jed.rc.orig Mon Feb 13 18:51:58 2006
> ++++ lib/jed.rc Sat Oct 10 18:08:25 2009
> +@@ -149,7 +149,7 @@ WRAP_INDENTS = 0; % Non zero indents next line
> after w
> %---------------------------------------------------------------------------
> % C-mode indentation style
> %---------------------------------------------------------------------------
> @@ -10,7 +10,7 @@ $OpenBSD: patch-lib_jed_rc,v 1.3 2005/04
>
> #ifdef IBMPC_SYSTEM
> % If non-zero, treat file names as case sensitive
> -@@ -240,4 +240,21 @@ define dired_hook ()
> +@@ -237,4 +237,21 @@ define dired_hook ()
> {
> %local_unsetkey ("^K");
> %local_setkey ("dired_kill_line", "^K");
> Index: editors/jed/patches/patch-src_Makefile.in
> ===================================================================
> RCS file: editors/jed/patches/patch-src_Makefile.in
> diff -N editors/jed/patches/patch-src_Makefile.in
> --- editors/jed/patches/patch-src_Makefile.in 11 Jan 2004 06:20:30 -0000
> 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,72 +0,0 @@
> -$OpenBSD: patch-src_Makefile.in,v 1.5 2004/01/11 06:20:30 brad Exp $
> ---- src/Makefile.in.orig 2002-10-20 02:55:30.000000000 -0400
> -+++ src/Makefile.in 2004-01-11 00:10:34.000000000 -0500
> -@@ -59,7 +59,7 @@ OBJDIR = @OBJDIR@
> -
> - # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
> - # Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
> --#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
> -+XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
> -
> - #---------------------------------------------------------------------------
> - # S-Lang library location
> -@@ -158,7 +158,7 @@ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm
> - rgrep: $(OBJDIR)/rgrep
> - @echo rgrep created in $(OBJDIR)
> - $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
> -- cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB)
> -lslang
> -+ cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(TERMCAP_LIB)
> $(OTHERLIBS) $(SLANG_LIB) -lslang
> - #
> - getmail: $(OBJDIR)/getmail
> - @echo getmail created in $(OBJDIR)
> -@@ -175,14 +175,14 @@ distclean: clean
> - /bin/rm -rf $(OBJDIR) Makefile sysconf.h
> -
> - install_directories:
> -+ $(MKINSDIR) $(DESTDIR)$(prefix)/info
> -+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed
> -+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/txt
> -+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/manual
> - $(MKINSDIR) $(DEST_BIN_DIR)
> - $(MKINSDIR) $(DEST_MAN_DIR)
> - $(MKINSDIR) $(DEST_JED_ROOT)
> - $(MKINSDIR) $(DEST_JED_ROOT)/bin
> -- $(MKINSDIR) $(DEST_JED_ROOT)/info
> -- $(MKINSDIR) $(DEST_JED_ROOT)/doc
> -- $(MKINSDIR) $(DEST_JED_ROOT)/doc/txt
> -- $(MKINSDIR) $(DEST_JED_ROOT)/doc/manual
> - $(MKINSDIR) $(DEST_JED_ROOT)/lib
> - $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors
> - $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed
> -@@ -225,23 +225,23 @@ install: all install_directories
> - done
> - @for i in $(JED_DOC_FILES); \
> - do \
> -- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
> -- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
> -+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
> -+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
> - done
> - @for i in $(JED_DOC_TXT_FILES); \
> - do \
> -- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
> -- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
> -+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \
> -+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt;
> \
> - done
> - @for i in $(JED_DOC_MAN_FILES); \
> - do \
> -- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
> -- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
> -+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/manual; \
> -+ echo $(INSTALL_DATA) $$i
> $(DESTDIR)$(prefix)/share/doc/jed/manual; \
> - done
> - @for i in $(JED_INFO_FILES); \
> - do \
> -- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
> -- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
> -+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
> -+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
> - done
> -
> - # The symlinks target is for my own private use. It simply creates the
> object
> Index: editors/jed/patches/patch-src_Makefile_in
> ===================================================================
> RCS file: editors/jed/patches/patch-src_Makefile_in
> diff -N editors/jed/patches/patch-src_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ editors/jed/patches/patch-src_Makefile_in 10 Oct 2009 18:40:11 -0000
> @@ -0,0 +1,67 @@
> +$OpenBSD$
> +--- src/Makefile.in.orig Thu Feb 16 04:09:50 2006
> ++++ src/Makefile.in Sat Oct 10 18:16:26 2009
> +@@ -60,7 +60,7 @@ OBJDIR = @OBJDIR@
> +
> + # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
> + # Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
> +-#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
> ++XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
> +
> + #---------------------------------------------------------------------------
> + # S-Lang library location
> +@@ -187,11 +187,10 @@ install_directories:
> + $(MKINSDIR) $(DEST_MAN_DIR)
> + $(MKINSDIR) $(DEST_JED_ROOT)
> + $(MKINSDIR) $(DEST_JED_ROOT)/bin
> +- $(MKINSDIR) $(DEST_JED_ROOT)/info
> +- $(MKINSDIR) $(DEST_JED_ROOT)/doc
> +- $(MKINSDIR) $(DEST_JED_ROOT)/doc/txt
> +- $(MKINSDIR) $(DEST_JED_ROOT)/doc/hlp
> +- $(MKINSDIR) $(DEST_JED_ROOT)/doc/manual
> ++ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed
> ++ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed/txt
> ++ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed/hlp
> ++ $(MKINSDIR) $(DESTDIR)${prefix}/share/doc/jed/manual
> + $(MKINSDIR) $(DEST_JED_ROOT)/lib
> + $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors
> + $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed
> +@@ -232,28 +231,28 @@ install: all install_directories
> + done
> + @for i in $(JED_DOC_FILES); \
> + do \
> +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
> +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
> ++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed; \
> ++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed; \
> + done
> + @for i in $(JED_DOC_TXT_FILES); \
> + do \
> +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
> +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
> ++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \
> ++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt;
> \
> + done
> + @for i in $(JED_DOC_HLP_FILES); \
> + do \
> +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/hlp; \
> +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/hlp; \
> ++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/hlp; \
> ++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/hlp;
> \
> + done
> + @for i in $(JED_DOC_MAN_FILES); \
> + do \
> +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
> +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
> ++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/manual; \
> ++ echo $(INSTALL_DATA) $$i
> $(DESTDIR)$(prefix)/share/doc/jed/manual; \
> + done
> + @for i in $(JED_INFO_FILES); \
> + do \
> +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
> +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
> ++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
> ++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
> + done
> + #
> + runtests: $(OBJDIR)/jed
> Index: editors/jed/pkg/PFRAG.no-no_x11
> ===================================================================
> RCS file: /cvs/ports/editors/jed/pkg/PFRAG.no-no_x11,v
> retrieving revision 1.1
> diff -u -p -r1.1 PFRAG.no-no_x11
> --- editors/jed/pkg/PFRAG.no-no_x11 6 Sep 2000 07:14:15 -0000 1.1
> +++ editors/jed/pkg/PFRAG.no-no_x11 10 Oct 2009 18:40:11 -0000
> @@ -1,2 +1,2 @@
> @comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/09/06 07:14:15 brad Exp $
> -bin/xjed
> +...@bin bin/xjed
> Index: editors/jed/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/jed/pkg/PLIST,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST
> --- editors/jed/pkg/PLIST 15 Sep 2004 18:01:06 -0000 1.13
> +++ editors/jed/pkg/PLIST 10 Oct 2009 18:40:11 -0000
> @@ -1,13 +1,12 @@
> @comment $OpenBSD: PLIST,v 1.13 2004/09/15 18:01:06 espie Exp $
> -bin/jed
> +...@bin bin/jed
> bin/jed-script
> -bin/rgrep
> @comment info/dir.info
> @comment info/info.info
> @info info/jed.info
> lib/jed/
> lib/jed/bin/
> -lib/jed/bin/getmail
> +...@bin lib/jed/bin/getmail
> lib/jed/lib/
> lib/jed/lib/abbrev.sl
> lib/jed/lib/abbrmisc.sl
> @@ -30,11 +29,15 @@ lib/jed/lib/cmode.sl
> lib/jed/lib/colors/
> lib/jed/lib/colors/README
> lib/jed/lib/colors/Xjed/
> +lib/jed/lib/colors/Xjed/black4.sl
> lib/jed/lib/colors/Xjed/elegant.sl
> +lib/jed/lib/colors/Xjed/modern.sl
> +lib/jed/lib/colors/Xjed/night.sl
> lib/jed/lib/colors/Xjed/pastel0.sl
> lib/jed/lib/colors/black1.sl
> lib/jed/lib/colors/black2.sl
> lib/jed/lib/colors/black3.sl
> +lib/jed/lib/colors/black4.sl
> lib/jed/lib/colors/blue1.sl
> lib/jed/lib/colors/blue2.sl
> lib/jed/lib/colors/blue3.sl
> @@ -46,7 +49,9 @@ lib/jed/lib/compile.sl
> lib/jed/lib/compress.sl
> lib/jed/lib/cpright.hlp
> lib/jed/lib/ctags.sl
> +lib/jed/lib/cua.hlp
> lib/jed/lib/cua.sl
> +lib/jed/lib/cuamisc.sl
> lib/jed/lib/dabbrev.sl
> lib/jed/lib/dcl.sl
> lib/jed/lib/digraph.sl
> @@ -67,6 +72,7 @@ lib/jed/lib/filter.sl
> lib/jed/lib/folding.sl
> lib/jed/lib/fortran.sl
> lib/jed/lib/generic.hlp
> +lib/jed/lib/gpg.sl
> lib/jed/lib/help.sl
> lib/jed/lib/history.sl
> lib/jed/lib/hooks.sl
> @@ -96,9 +102,12 @@ lib/jed/lib/linux.sl
> lib/jed/lib/lisp.sl
> lib/jed/lib/ltx-comp.dat
> lib/jed/lib/ltx-math.sl
> +lib/jed/lib/lua.sl
> lib/jed/lib/macro.sl
> lib/jed/lib/mail.sl
> lib/jed/lib/mailalias.sl
> +lib/jed/lib/mailedit.sl
> +lib/jed/lib/mailutils.sl
> lib/jed/lib/man.sl
> lib/jed/lib/maple.sl
> lib/jed/lib/matlab.sl
> @@ -118,6 +127,7 @@ lib/jed/lib/mutekeys.sl
> lib/jed/lib/nroff.sl
> lib/jed/lib/occur.sl
> lib/jed/lib/os.sl
> +lib/jed/lib/paste.sl
> lib/jed/lib/perl.sl
> lib/jed/lib/php.sl
> lib/jed/lib/pipe.sl
> @@ -147,6 +157,7 @@ lib/jed/lib/sort.sl
> lib/jed/lib/sortmisc.sl
> lib/jed/lib/spicemod.sl
> lib/jed/lib/srchmisc.sl
> +lib/jed/lib/syncproc.sl
> lib/jed/lib/syntax.sl
> lib/jed/lib/tabs.sl
> lib/jed/lib/tclmode.sl
> @@ -154,7 +165,6 @@ lib/jed/lib/tex.sl
> lib/jed/lib/texcom.sl
> lib/jed/lib/textmode.sl
> lib/jed/lib/tiasm.sl
> -lib/jed/lib/tm/
> lib/jed/lib/tmisc.sl
> lib/jed/lib/tmmode.sl
> lib/jed/lib/tpascal.sl
> @@ -168,11 +178,15 @@ lib/jed/lib/wmark.sl
> lib/jed/lib/wmenu.sl
> lib/jed/lib/wordstar.hlp
> lib/jed/lib/wordstar.sl
> +lib/jed/lib/xformreg.sl
> lib/jed/lib/yankpop.sl
> @man man/man1/jed.1
> @man man/man1/rgrep.1
> share/doc/jed/
> share/doc/jed/README
> +share/doc/jed/hlp/
> +share/doc/jed/hlp/jedfuns.hlp
> +share/doc/jed/hlp/libfuns.hlp
> share/doc/jed/manual/
> share/doc/jed/manual/jed.tex
> share/doc/jed/txt/
> @@ -187,8 +201,6 @@ share/doc/jed/txt/fold.txt
> share/doc/jed/txt/hooks.txt
> share/doc/jed/txt/ide-mode.txt
> share/doc/jed/txt/jed_faq.txt
> -share/doc/jed/txt/jedfuns.txt
> -share/doc/jed/txt/libfuns.txt
> share/doc/jed/txt/linux-keys.txt
> share/doc/jed/txt/menus.txt
> share/doc/jed/txt/mouse.txt
> @@ -199,6 +211,7 @@ share/doc/jed/txt/rmail.txt
> share/doc/jed/txt/script.txt
> share/doc/jed/txt/syntax.txt
> share/doc/jed/txt/undo.txt
> +share/doc/jed/txt/utf8.txt
> share/doc/jed/txt/wjed.txt
> share/doc/jed/txt/wordstar.txt
> share/doc/jed/txt/xjed.txt
> Index: misc/most/Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/most/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- misc/most/Makefile 4 Jan 2008 17:48:36 -0000 1.12
> +++ misc/most/Makefile 10 Oct 2009 18:40:11 -0000
> @@ -2,27 +2,26 @@
>
> COMMENT= browse or page through a text file
>
> -DISTNAME= most-4.9.5
> +DISTNAME= most-5.0.0a
> CATEGORIES= misc
>
> MASTER_SITES= ftp://space.mit.edu/pub/davis/most/ \
> http://openbsd.rutgers.edu/
>
> -LIB_DEPENDS= slang.>=14::devel/libslang
> +LIB_DEPENDS= slang.>=15::devel/libslang
>
> MAINTAINER= William Yodlowsky <[email protected]>
>
> -FAKE= lib
> +# GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> -WANTLIB= c m termcap
>
> -FAKE_FLAGS= DOC_DIR='$$(prefix)/share/doc/most'
> +WANTLIB= c m termcap
>
> CONFIGURE_STYLE= gnu
> -CONFIGURE_ENV+=DEPBASE=${DEPBASE}
> +CONFIGURE_ARGS= --with-slang=${LOCALBASE}
>
> NO_REGRESS= Yes
>
> Index: misc/most/distinfo
> ===================================================================
> RCS file: /cvs/ports/misc/most/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- misc/most/distinfo 5 Apr 2007 17:41:07 -0000 1.5
> +++ misc/most/distinfo 10 Oct 2009 18:40:11 -0000
> @@ -1,5 +1,5 @@
> -MD5 (most-4.9.5.tar.gz) = XAkilSSFsKWCLvmUYD3MLw==
> -RMD160 (most-4.9.5.tar.gz) = hur/zLHTOTYWlodNnYz4e8QoZp8=
> -SHA1 (most-4.9.5.tar.gz) = rrivBYrzcEwhFa+4bom0lOGqZsc=
> -SHA256 (most-4.9.5.tar.gz) = 9llWTFuY60zVqlbJc0FMjUgA3GF4ZtCQGWWhAm9/kXE=
> -SIZE (most-4.9.5.tar.gz) = 117361
> +MD5 (most-5.0.0a.tar.gz) = MPITG2f2Fxb2/h9lIF2kiw==
> +RMD160 (most-5.0.0a.tar.gz) = Ww0aHFqIO5SpcqXPwb0IjWwc9Xg=
> +SHA1 (most-5.0.0a.tar.gz) = me7bcWl1S5pHx3VaxIlJ12Ux47I=
> +SHA256 (most-5.0.0a.tar.gz) = F6Flk9oGTd1IT1MVfVS4O82Y6kWrHtNh7qZMT64WOhA=
> +SIZE (most-5.0.0a.tar.gz) = 155233
> Index: misc/most/patches/patch-configure
> ===================================================================
> RCS file: misc/most/patches/patch-configure
> diff -N misc/most/patches/patch-configure
> --- misc/most/patches/patch-configure 19 Apr 2005 09:41:42 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1 2005/04/19 09:41:42 espie Exp $
> ---- configure.orig Tue Apr 19 11:23:47 2005
> -+++ configure Tue Apr 19 11:24:04 2005
> -@@ -2560,6 +2560,7 @@ fi
> - test "x$exec" = "xNONE" && exec="$ac_default_prefix"
> - test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
> - JD_Search_Dirs="$JD_Search_Dirs \
> -+ $DEPBASE/include,$DEPBASE/lib \
> - /usr/local/include,/usr/local/lib \
> - /usr/include,/usr/lib \
> - /usr/include/slang,/usr/lib \
> Index: misc/most/patches/patch-src_Makefile_in
> ===================================================================
> RCS file: misc/most/patches/patch-src_Makefile_in
> diff -N misc/most/patches/patch-src_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ misc/most/patches/patch-src_Makefile_in 10 Oct 2009 18:40:11 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/Makefile.in.orig Sat Oct 10 17:56:33 2009
> ++++ src/Makefile.in Sat Oct 10 17:56:45 2009
> +@@ -22,7 +22,7 @@ prefix = @prefix@
> + exec_prefix = @exec_prefix@
> + datarootdir = @datarootdir@
> + BIN_DIR = $(prefix)/bin
> +-MAN_DIR = $(datarootdir)/man
> ++MAN_DIR = $(prefix)/man
> + DOC_DIR = $(datarootdir)/doc/most
> + SYS_INITFILE = @sysconfdir@/most.conf
> + MKINSDIR = ../autoconf/mkinsdir.sh
> Index: misc/most/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/misc/most/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- misc/most/pkg/PLIST 15 Sep 2004 17:54:16 -0000 1.3
> +++ misc/most/pkg/PLIST 10 Oct 2009 18:40:11 -0000
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2004/09/15 17:54:16 espie Exp $
> -bin/most
> +...@bin bin/most
> @man man/man1/most.1
> share/doc/most/
> share/doc/most/README
> Index: misc/pdmenu/Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/pdmenu/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- misc/pdmenu/Makefile 4 Jan 2008 17:48:36 -0000 1.15
> +++ misc/pdmenu/Makefile 10 Oct 2009 18:40:11 -0000
> @@ -2,8 +2,8 @@
>
> COMMENT= simple slang-based menu program
>
> -DISTNAME= pdmenu_1.2.69
> -PKGNAME= pdmenu-1.2.69
> +DISTNAME= pdmenu_1.2.98
> +PKGNAME= ${DISTNAME:S/_/-/}
> CATEGORIES= misc
>
> HOMEPAGE= http://kitenet.net/programs/pdmenu/
> @@ -13,21 +13,42 @@ PERMIT_PACKAGE_CDROM= Yes
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> -WANTLIB= c m termcap
> +WANTLIB= c curses iconv m
>
> -MASTER_SITES= http://kitenet.net/programs/code/pdmenu/
> +MASTER_SITES=
> http://ftp.de.debian.org/debian/pool/main/p/pdmenu/
>
> -LIB_DEPENDS= slang.>=14::devel/libslang
> +LIB_DEPENDS= slang.>=15::devel/libslang
> +MODULES= devel/gettext
>
> DESTDIRNAME= INSTALL_PREFIX
>
> -FAKE= lib
> +USE_GMAKE= Yes
> CONFIGURE_STYLE= autoconf no-autoheader
> -AUTOCONF_VERSION= 2.13
> -CONFIGURE_ENV= SLANG_LIB_LOC=${DEPBASE}/lib \
> +AUTOCONF_VERSION= 2.61
> +
> +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
> +#CONFIGURE_ARGS= --datadir=${PREFIX}/share/examples
> +CONFIGURE_ENV= LIBS="-lm -lcurses -lintl -liconv" \
> + SLANG_LIB_LOC=${DEPBASE}/lib \
> SLANG_H_LOC=${DEPBASE}/include/slang.h
> WRKDIST= ${WRKDIR}/pdmenu
>
> NO_REGRESS= Yes
> +
> +do-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pdmenu
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pdmenu/newbie
> + ${INSTALL_PROGRAM} ${WRKSRC}/pdmenu ${PREFIX}/bin
> + ${INSTALL_DATA} ${WRKSRC}/examples/pdmenurc
> ${PREFIX}/share/examples/pdmenu
> + ${INSTALL_MAN} ${WRKSRC}/doc/pdmenu.man ${PREFIX}/man/man1/pdmenu.1
> + ${INSTALL_MAN} ${WRKSRC}/doc/pdmenurc.man ${PREFIX}/man/man5/pdmenurc.5
> +.for i in README ba.lpd editdir.pl pdmenurc pdmenurc.complex
> pdmenurc.monitor showdir.pl newbie/modem-check newbie/pdmenurc.newbie
> newbie/rpm-info-on-command
> + ${INSTALL_SCRIPT} ${WRKSRC}/examples/$i
> ${PREFIX}/share/examples/pdmenu/$i
> +.endfor
> +.for lang in fr es ru
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
> + ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
> + ${PREFIX}/share/locale/${lang}/LC_MESSAGES/pdmenu.mo
> +.endfor
>
> .include <bsd.port.mk>
> Index: misc/pdmenu/distinfo
> ===================================================================
> RCS file: /cvs/ports/misc/pdmenu/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- misc/pdmenu/distinfo 5 Apr 2007 17:41:08 -0000 1.3
> +++ misc/pdmenu/distinfo 10 Oct 2009 18:40:11 -0000
> @@ -1,5 +1,5 @@
> -MD5 (pdmenu_1.2.69.tar.gz) = Qf7cr2gKsDeIMlHP3/BU9g==
> -RMD160 (pdmenu_1.2.69.tar.gz) = bu2GKN41ibyiJkKuCFpI5NFWCLA=
> -SHA1 (pdmenu_1.2.69.tar.gz) = 4xgrZO21z64LuK/c3LQC2sTenvQ=
> -SHA256 (pdmenu_1.2.69.tar.gz) = kQA6wWv++TESW6GoluHpH+ZAb2fgNSBQiq87zFZF588=
> -SIZE (pdmenu_1.2.69.tar.gz) = 92791
> +MD5 (pdmenu_1.2.98.tar.gz) = VDkHE3TabJgE1+s3JqJbMw==
> +RMD160 (pdmenu_1.2.98.tar.gz) = oqWuTR/qQXkffu+ujmOFGi2YFmQ=
> +SHA1 (pdmenu_1.2.98.tar.gz) = eU/xXJivDceOjOPRfR/ShlmVN1A=
> +SHA256 (pdmenu_1.2.98.tar.gz) = KCxT7pQFo6MmO0ljqrxFrbV1vW54MGJZPipMOh5aBlQ=
> +SIZE (pdmenu_1.2.98.tar.gz) = 155652
> Index: misc/pdmenu/patches/patch-autoconf_makeinfo_in
> ===================================================================
> RCS file: misc/pdmenu/patches/patch-autoconf_makeinfo_in
> diff -N misc/pdmenu/patches/patch-autoconf_makeinfo_in
> --- misc/pdmenu/patches/patch-autoconf_makeinfo_in 31 Dec 2003 21:36:51
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,49 +0,0 @@
> -$OpenBSD: patch-autoconf_makeinfo_in,v 1.1 2003/12/31 21:36:51 pvalchev Exp $
> ---- autoconf/makeinfo.in.orig 2001-07-14 21:26:21.000000000 -0600
> -+++ autoconf/makeinfo.in 2003-12-31 14:48:02.000000000 -0700
> -@@ -9,6 +9,7 @@ exec_prefix = @exec_prefix@
> - BINDIR = @bindir@
> - MANDIR = @mandir@
> - LIBDIR = @libdir@/pdmenu
> -+EXAMPLESDIR = @datadir@/examples/pdmenu
> - SYSCONFDIR = @sysconfdir@
> - CC = @CC@
> - INSTALL = @INSTALL@
> -@@ -60,21 +61,25 @@ clean:
> - rm -f src/*.o pdmenu
> -
> - install: all
> -- $(INSTALL) -d $(INSTALL_PREFIX)/$(BINDIR) \
> -- $(INSTALL_PREFIX)/$(MANDIR)/man1 \
> -- $(INSTALL_PREFIX)/$(MANDIR)/man5 \
> -- $(INSTALL_PREFIX)/$(SYSCONFDIR) \
> -- $(INSTALL_PREFIX)/$(LIBDIR)
> -+ $(INSTALL) -d $(INSTALL_PREFIX)/$(BINDIR)
> -+ $(INSTALL) -d $(INSTALL_PREFIX)/$(MANDIR)/man1
> -+ $(INSTALL) -d $(INSTALL_PREFIX)/$(MANDIR)/man5
> -+ $(INSTALL) -d $(INSTALL_PREFIX)/$(SYSCONFDIR)
> -+ $(INSTALL) -d $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ $(INSTALL) -d $(INSTALL_PREFIX)/$(EXAMPLESDIR)/newbie
> - $(INSTALL) -s pdmenu $(INSTALL_PREFIX)/$(BINDIR)
> - $(INSTALL) doc/pdmenu.man $(INSTALL_PREFIX)/$(MANDIR)/man1/pdmenu.1 -m
> 0644
> - $(INSTALL) doc/pdmenurc.man $(INSTALL_PREFIX)/$(MANDIR)/man5/pdmenurc.5
> -m 0644
> -- if [ -e $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc ]; then \
> -- echo "Backing up $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc to
> $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc.old .." ; \
> -- cp $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc
> $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc.old ; \
> -- fi
> -- $(INSTALL) examples/pdmenurc $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc
> -m 0644
> -- $(INSTALL) examples/showdir.pl $(INSTALL_PREFIX)/$(LIBDIR)
> -- cd $(INSTALL_PREFIX)/$(LIBDIR) && $(LN_S) -f showdir.pl editdir.pl
> -+ $(INSTALL) examples/README $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ $(INSTALL) examples/ba.lpd $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ $(INSTALL) examples/pdmenurc $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ $(INSTALL) examples/pdmenurc.complex $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ $(INSTALL) examples/pdmenurc.monitor $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ $(INSTALL) examples/showdir.pl $(INSTALL_PREFIX)/$(EXAMPLESDIR)
> -+ cd $(INSTALL_PREFIX)/$(EXAMPLESDIR) && $(LN_S) -f showdir.pl editdir.pl
> -+ $(INSTALL) examples/newbie/modem-check
> $(INSTALL_PREFIX)/$(EXAMPLESDIR)/newbie
> -+ $(INSTALL) examples/newbie/pdmenurc.newbie
> $(INSTALL_PREFIX)/$(EXAMPLESDIR)/newbie
> -+ $(INSTALL) examples/newbie/rpm-info-on-command
> $(INSTALL_PREFIX)/$(EXAMPLESDIR)/newbie
> -
> - test: pdmenu
> - ./pdmenu examples/pdmenurc
> Index: misc/pdmenu/patches/patch-configure_ac
> ===================================================================
> RCS file: misc/pdmenu/patches/patch-configure_ac
> diff -N misc/pdmenu/patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ misc/pdmenu/patches/patch-configure_ac 10 Oct 2009 18:40:11 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD: patch-configure_in,v 1.1 2004/01/24 13:52:39 naddy Exp $
> +--- configure.ac.orig Wed Dec 17 00:25:50 2008
> ++++ configure.ac Sat Oct 10 14:31:52 2009
> +@@ -52,10 +52,13 @@ if test "$SLANG_LIB_LOC" != "" ; then
> + CFLAGS="-L$SLANG_LIB_LOC $CFLAGS"
> + fi
> +
> ++AC_SEARCH_LIBS(tgetent, terminfo termlib)
> ++
> + dnl The function we check for in libslang is important, because
> + dnl we need to make sure we have the right version of slang.
> +-AC_CHECK_LIB(slang, SLsig_block_signals,,
> +- AC_MSG_ERROR(can't find required slang library or library is obsolete.
> Try setting the SLANG_LIB_LOC environment variable to point to the directory
> containing the slang library.))
> ++AC_CHECK_LIB(slang, SLsig_block_signals,
> ++ [AC_DEFINE(HAVE_LIBSLANG) LIBS="-lslang -lm $LIBS"],
> ++ AC_MSG_ERROR(can't find required slang library or library is obsolete.
> Try setting the SLANG_LIB_LOC environment variable to point to the directory
> containing the slang library.), -lm)
> +
> + dnl Checks for header files.
> + AC_HEADER_STDC
> Index: misc/pdmenu/patches/patch-configure_in
> ===================================================================
> RCS file: misc/pdmenu/patches/patch-configure_in
> diff -N misc/pdmenu/patches/patch-configure_in
> --- misc/pdmenu/patches/patch-configure_in 24 Jan 2004 13:52:39 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,47 +0,0 @@
> -$OpenBSD: patch-configure_in,v 1.1 2004/01/24 13:52:39 naddy Exp $
> ---- configure.in.orig 2001-05-15 04:54:05.000000000 +0200
> -+++ configure.in 2004-01-21 23:03:20.000000000 +0100
> -@@ -43,10 +43,13 @@ if test "$SLANG_LIB_LOC" != "" ; then
> - CFLAGS="-L$SLANG_LIB_LOC $CFLAGS"
> - fi
> -
> -+AC_SEARCH_LIBS(tgetent, termcap terminfo termlib)
> -+
> - dnl The function we check for in libslang is important, because
> - dnl we need to make sure we have the right version of slang.
> --AC_CHECK_LIB(slang, SLsig_block_signals,,
> -- AC_MSG_ERROR(can't find required slang library or library is obsolete.
> Try setting the SLANG_LIB_LOC environment variable to point to the directory
> containing the slang library.))
> -+AC_CHECK_LIB(slang, SLsig_block_signals,
> -+ [AC_DEFINE(HAVE_LIBSLANG) LIBS="-lslang -lm $LIBS"],
> -+ AC_MSG_ERROR(can't find required slang library or library is obsolete.
> Try setting the SLANG_LIB_LOC environment variable to point to the directory
> containing the slang library.), -lm)
> -
> - dnl Checks for header files.
> - AC_HEADER_STDC
> -@@ -98,27 +101,6 @@ else
> - AC_MSG_WARN(pdmenu will be built without GPM mouse support.)
> - fi
> -
> --dnl If we cannot find terminfo, link with termcap.
> --Terminfo_Dirs="/usr/lib/terminfo \
> -- /usr/share/lib/terminfo \
> -- /usr/local/lib/terminfo"
> --TERMCAP=yes
> --AC_MSG_CHECKING(for terminfo)
> --for terminfo_dir in $Terminfo_Dirs
> --do
> -- if test -d $terminfo_dir; then
> -- AC_MSG_RESULT(found)
> -- TERMCAP=""
> -- break
> -- fi
> --done
> --if test "$TERMCAP"; then
> -- AC_MSG_RESULT(not found)
> -- AC_CHECK_LIB(termcap,tgetent)
> -- # Note that if this fails, we continue and make probably dies with
> -- # an error. Unless terminfo is hiding somewhere else..
> --fi
> --
> - AC_CHECK_PROG(DATE_PROG,date,yes,no)
> - if test "$DATE_PROG" = yes ; then
> - AC_MSG_CHECKING(for GNU compatable date utility)
> Index: misc/pdmenu/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/misc/pdmenu/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- misc/pdmenu/pkg/PLIST 15 Sep 2004 17:54:16 -0000 1.3
> +++ misc/pdmenu/pkg/PLIST 10 Oct 2009 18:40:11 -0000
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2004/09/15 17:54:16 espie Exp $
> -bin/pdmenu
> +...@bin bin/pdmenu
> @man man/man1/pdmenu.1
> @man man/man5/pdmenurc.5
> share/examples/pdmenu/
> @@ -14,3 +14,13 @@ share/examples/pdmenu/pdmenurc
> share/examples/pdmenu/pdmenurc.complex
> share/examples/pdmenu/pdmenurc.monitor
> share/examples/pdmenu/showdir.pl
> +share/locale/
> +share/locale/es/
> +share/locale/es/LC_MESSAGES/
> +share/locale/es/LC_MESSAGES/pdmenu.mo
> +share/locale/fr/
> +share/locale/fr/LC_MESSAGES/
> +share/locale/fr/LC_MESSAGES/pdmenu.mo
> +share/locale/ru/
> +share/locale/ru/LC_MESSAGES/
> +share/locale/ru/LC_MESSAGES/pdmenu.mo
> Index: news/slrn/Makefile
> ===================================================================
> RCS file: /cvs/ports/news/slrn/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- news/slrn/Makefile 15 Sep 2007 21:41:50 -0000 1.43
> +++ news/slrn/Makefile 10 Oct 2009 18:40:11 -0000
> @@ -2,9 +2,8 @@
>
> COMMENT= SLang-based newsreader
>
> -VERSION= 0.9.8.1
> -DISTNAME= slrn-${VERSION}
> -PKGNAME= ${DISTNAME}p2
> +DISTNAME= slrn-0.9.9p1 # p1 is part of upstream version XXX
> +PKGNAME= ${DISTNAME:S/p/pl/}
> CATEGORIES= news
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slrn/}
> @@ -15,26 +14,30 @@ PERMIT_PACKAGE_CDROM= Yes
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> +
> WANTLIB= c crypto m ssl termcap
>
> -FAKE= lib
> -PFILES= lastchar fetch
> -MASTER_SITES0= http://slrn.sourceforge.net/patches/
> -.for i in ${PFILES}
> -PATCHFILES+= slrn-${VERSION}-$i.diff:0
> -.endfor
> -PATCH_DIST_STRIP=-p1
> +#FAKE= lib
> +##PFILES= lastchar fetch
> +##MASTER_SITES0= http://slrn.sourceforge.net/patches/
> +##.for i in ${PFILES}
> +##PATCHFILES+= slrn-${VERSION}-$i.diff:0
> +##.endfor
> +##PATCH_DIST_STRIP=-p1
> +MAKE_ARGS+= SLRN_SENDMAIL_COMMAND="/usr/sbin/sendmail -oi -t -oem
> -odb" \
> + LDFLAGS="${LDFLAGS}"
>
> NO_REGRESS= Yes
> -LIB_DEPENDS= slang.::devel/libslang
> +LIB_DEPENDS= slang.>=15::devel/libslang
> MODULES= devel/gettext
>
> CONFIGURE_STYLE= gnu
> CONFIGURE_ARGS+= --disable-inews --with-ssl --with-slrnpull
> --enable-spool
> -CONFIGURE_ARGS+= --with-slang-library=${DEPBASE}/lib \
> - --with-slang-includes=${DEPBASE}/include \
> - --with-libiconv-prefix=${DEPBASE} \
> - --with-libintl-prefix=${DEPBASE}
> +LDFLAGS= -L${LOCALBASE}/lib -lm
> +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
> +#CPPFLAGS="-I ${LOCALBASE}/include"
> +CONFIGURE_ARGS+= --with-slang=${LOCALBASE} \
> + --with-libiconv=${LOCALBASE}
>
> MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf
>
> Index: news/slrn/distinfo
> ===================================================================
> RCS file: /cvs/ports/news/slrn/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- news/slrn/distinfo 5 Apr 2007 16:20:17 -0000 1.7
> +++ news/slrn/distinfo 10 Oct 2009 18:40:11 -0000
> @@ -1,15 +1,5 @@
> -MD5 (slrn-0.9.8.1-fetch.diff) = lpRxaFqnQSvGCGlkkxJhjw==
> -MD5 (slrn-0.9.8.1-lastchar.diff) = e8xbQT20tbmqsiZiIxFnrw==
> -MD5 (slrn-0.9.8.1.tar.gz) = bQ2aEOrpW6kCKUwC5D6g0Q==
> -RMD160 (slrn-0.9.8.1-fetch.diff) = 52cXj5Q/k01hvDu0kYnVhW9U5q8=
> -RMD160 (slrn-0.9.8.1-lastchar.diff) = iQbwSbpyJdQ9vbOk0Vx87moQcKU=
> -RMD160 (slrn-0.9.8.1.tar.gz) = CQiC2HmqsNIGwOFoRF0j8Ybrr+k=
> -SHA1 (slrn-0.9.8.1-fetch.diff) = VZEzLOKMMIOuZIULbU83HDz3d3M=
> -SHA1 (slrn-0.9.8.1-lastchar.diff) = 75nzlX+fu6DDB98EkOqERXUILY8=
> -SHA1 (slrn-0.9.8.1.tar.gz) = FQLev1JLkOzrKxUgKm080PXcaIc=
> -SHA256 (slrn-0.9.8.1-fetch.diff) =
> CuIoB18Vl38NBjzWDvib48mEaS7tdep6o+uzu1nX4kM=
> -SHA256 (slrn-0.9.8.1-lastchar.diff) =
> S+mQPyKogLVoaaFtJqT+7fRxJbfbYx4OxvG5dvnJv5k=
> -SHA256 (slrn-0.9.8.1.tar.gz) = Y7drVimkUE8pTWtXNT/+YLzG83+6rrD3sbmG4BhL6ik=
> -SIZE (slrn-0.9.8.1-fetch.diff) = 920
> -SIZE (slrn-0.9.8.1-lastchar.diff) = 4411
> -SIZE (slrn-0.9.8.1.tar.gz) = 1510596
> +MD5 (slrn-0.9.9p1.tar.gz) = bMisa6r/fMKot49/u+MYfw==
> +RMD160 (slrn-0.9.9p1.tar.gz) = nmFNEsMPcqTM3pD+VXSV2G1Es2g=
> +SHA1 (slrn-0.9.9p1.tar.gz) = 8U2I7aObeL0vCY8hHUocNjwP6SQ=
> +SHA256 (slrn-0.9.9p1.tar.gz) = OolvQreMMiUoeP0pGyHWSC1GaSG2irl/fYy630p2tTM=
> +SIZE (slrn-0.9.9p1.tar.gz) = 1535032
> Index: news/slrn/patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/news/slrn/patches/patch-configure,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-configure
> --- news/slrn/patches/patch-configure 19 Apr 2005 12:53:21 -0000 1.1
> +++ news/slrn/patches/patch-configure 10 Oct 2009 18:40:11 -0000
> @@ -1,16 +1,57 @@
> -$OpenBSD: patch-configure,v 1.1 2005/04/19 12:53:21 alek Exp $
> ---- configure.orig Tue Apr 19 14:13:16 2005
> -+++ configure Tue Apr 19 14:13:22 2005
> -@@ -9736,10 +9736,10 @@ s,@host_cpu@,$host_cpu,;t t
> - s,@host_vendor@,$host_vendor,;t t
> - s,@host_os@,$host_os,;t t
> - s,@USE_NLS@,$USE_NLS,;t t
> --s,@LIBICONV@,$LIBICONV,;t t
> -+s,@LIBICONV@,$LTLIBICONV,;t t
> - s,@LTLIBICONV@,$LTLIBICONV,;t t
> - s,@INTLLIBS@,$INTLLIBS,;t t
> --s,@LIBINTL@,$LIBINTL,;t t
> -+s,@LIBINTL@,$LTLIBINTL,;t t
> - s,@LTLIBINTL@,$LTLIBINTL,;t t
> - s,@POSUB@,$POSUB,;t t
> - s,@TERMCAP@,$TERMCAP,;t t
> +$OpenBSD$
> +--- configure.orig Tue Aug 26 17:21:08 2008
> ++++ configure Sat Oct 10 20:33:28 2009
> +@@ -14216,7 +14216,7 @@ CANLOCK_LIB!$CANLOCK_LIB$ac_delim
> + CANLOCK_INC!$CANLOCK_INC$ac_delim
> + LINK_LIBCANLOCK!$LINK_LIBCANLOCK$ac_delim
> + SLRN_HAS_CANLOCK!$SLRN_HAS_CANLOCK$ac_delim
> +-LIBICONV!$LIBICONV$ac_delim
> ++LIBICONV!$LTLIBICONV$ac_delim
> + LTLIBICONV!$LTLIBICONV$ac_delim
> + _ACEOF
> +
> +@@ -14270,7 +14270,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
> + MSGMERGE!$MSGMERGE$ac_delim
> + INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
> + INTLLIBS!$INTLLIBS$ac_delim
> +-LIBINTL!$LIBINTL$ac_delim
> ++LIBINTL!$LTLIBINTL$ac_delim
> + LTLIBINTL!$LTLIBINTL$ac_delim
> + POSUB!$POSUB$ac_delim
> + INCICONV!$INCICONV$ac_delim
> +@@ -15574,7 +15574,7 @@ CANLOCK_LIB!$CANLOCK_LIB$ac_delim
> + CANLOCK_INC!$CANLOCK_INC$ac_delim
> + LINK_LIBCANLOCK!$LINK_LIBCANLOCK$ac_delim
> + SLRN_HAS_CANLOCK!$SLRN_HAS_CANLOCK$ac_delim
> +-LIBICONV!$LIBICONV$ac_delim
> ++LIBICONV!$LTLIBICONV$ac_delim
> + LTLIBICONV!$LTLIBICONV$ac_delim
> + _ACEOF
> +
> +@@ -15628,7 +15628,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
> + MSGMERGE!$MSGMERGE$ac_delim
> + INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
> + INTLLIBS!$INTLLIBS$ac_delim
> +-LIBINTL!$LIBINTL$ac_delim
> ++LIBINTL!$LTLIBINTL$ac_delim
> + LTLIBINTL!$LTLIBINTL$ac_delim
> + POSUB!$POSUB$ac_delim
> + INCICONV!$INCICONV$ac_delim
> +@@ -16933,7 +16933,7 @@ CANLOCK_LIB!$CANLOCK_LIB$ac_delim
> + CANLOCK_INC!$CANLOCK_INC$ac_delim
> + LINK_LIBCANLOCK!$LINK_LIBCANLOCK$ac_delim
> + SLRN_HAS_CANLOCK!$SLRN_HAS_CANLOCK$ac_delim
> +-LIBICONV!$LIBICONV$ac_delim
> ++LIBICONV!$LTLIBICONV$ac_delim
> + LTLIBICONV!$LTLIBICONV$ac_delim
> + _ACEOF
> +
> +@@ -16987,7 +16987,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
> + MSGMERGE!$MSGMERGE$ac_delim
> + INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
> + INTLLIBS!$INTLLIBS$ac_delim
> +-LIBINTL!$LIBINTL$ac_delim
> ++LIBINTL!$LTLIBINTL$ac_delim
> + LTLIBINTL!$LTLIBINTL$ac_delim
> + POSUB!$POSUB$ac_delim
> + INCICONV!$INCICONV$ac_delim
> Index: news/slrn/patches/patch-src_Makefile_in
> ===================================================================
> RCS file: news/slrn/patches/patch-src_Makefile_in
> diff -N news/slrn/patches/patch-src_Makefile_in
> --- news/slrn/patches/patch-src_Makefile_in 19 Apr 2005 12:53:21 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-src_Makefile_in,v 1.1 2005/04/19 12:53:21 alek Exp $
> ---- src/Makefile.in.orig Tue Apr 19 14:20:10 2005
> -+++ src/Makefile.in Tue Apr 19 14:20:20 2005
> -@@ -238,7 +238,7 @@ slrnpull_SOURCES = nntplib.c slrndir.c s
> - ranges.c vfile.c
> -
> - slrnpull_DEPENDENCIES = stamp2
> --INCLUDES = -I. -I$(top_srcdir)/intl @SLANG_INC@ @SSLINC@ @UUINC@ @LOCKINC@
> -+INCLUDES = -I. @SLANG_INC@ @SSLINC@ @UUINC@ @LOCKINC@
> - LDADD = @LIBINTL@ @SLANG_LIB@ -lslang @TERMCAP@ @SSLLIB@ @UULIB@ @LOCKLIB@
> - uudecode_SOURCES = slrndir.c snprintf.c ttymsg.c util.c
> - uudecode_LDADD = uudecode.o @LIBINTL@ @SLANG_LIB@ -lslang
> Index: news/slrn/patches/patch-src_slrnfeat_h
> ===================================================================
> RCS file: news/slrn/patches/patch-src_slrnfeat_h
> diff -N news/slrn/patches/patch-src_slrnfeat_h
> --- news/slrn/patches/patch-src_slrnfeat_h 10 Apr 2001 14:59:16 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-src_slrnfeat_h,v 1.1 2001/04/10 14:59:16 lebel Exp $
> ---- src/slrnfeat.h.orig Tue Apr 10 10:19:53 2001
> -+++ src/slrnfeat.h Tue Apr 10 10:22:10 2001
> -@@ -150,7 +150,7 @@
> - # define SLRN_FOLLOWUP_FILENAME ".followup"
> - # define SLRN_SIGNATURE_FILE ".signature"
> - # ifndef SLRN_SENDMAIL_COMMAND
> --# define SLRN_SENDMAIL_COMMAND "/usr/lib/sendmail -oi -t -oem -odb"
> -+# define SLRN_SENDMAIL_COMMAND "/usr/sbin/sendmail -oi -t -oem -odb"
> - # endif
> - # ifndef SLRN_LIB_DIR
> - # define SLRN_LIB_DIR "/usr/local/lib/slrn"
> Index: news/slrn/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/news/slrn/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -r1.14 PLIST
> --- news/slrn/pkg/PLIST 25 May 2007 00:50:50 -0000 1.14
> +++ news/slrn/pkg/PLIST 10 Oct 2009 18:40:11 -0000
> @@ -1,6 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.14 2007/05/25 00:50:50 aanriot Exp $
> -bin/slrn
> -bin/slrnpull
> +...@bin bin/slrn
> +...@bin bin/slrnpull
> @man man/man1/slrn.1
> @man man/man1/slrnpull.1
> share/doc/slrn/
> @@ -45,18 +45,19 @@ share/locale/ru/LC_MESSAGES/slrn.mo
> share/locale/sv/LC_MESSAGES/slrn.mo
> share/locale/tr/LC_MESSAGES/slrn.mo
> share/slrn/
> -share/slrn/macros/
> -share/slrn/macros/color.sl
> -share/slrn/macros/gsort.sl
> -share/slrn/macros/ispell.sl
> -share/slrn/macros/latin2.sl
> -share/slrn/macros/multipart.sl
> -share/slrn/macros/nn.sl
> -share/slrn/macros/posthook.sl
> -share/slrn/macros/search.sl
> -share/slrn/macros/tin-art.sl
> -share/slrn/macros/tin-group.sl
> -share/slrn/macros/ttyprint.sl
> -share/slrn/macros/util.sl
> -share/slrn/macros/varset.sl
> -share/slrn/macros/xcomment.sl
> +share/slrn/slang/
> +share/slrn/slang/color.sl
> +share/slrn/slang/gsort.sl
> +share/slrn/slang/ispell.sl
> +share/slrn/slang/latin2.sl
> +share/slrn/slang/multipart.sl
> +share/slrn/slang/nn.sl
> +share/slrn/slang/posthook.sl
> +share/slrn/slang/search.sl
> +share/slrn/slang/slrn.sl
> +share/slrn/slang/tin-art.sl
> +share/slrn/slang/tin-group.sl
> +share/slrn/slang/ttyprint.sl
> +share/slrn/slang/util.sl
> +share/slrn/slang/varset.sl
> +share/slrn/slang/xcomment.sl
> Index: devel/libslang/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/libslang/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- devel/libslang/Makefile 16 Sep 2007 02:53:01 -0000 1.45
> +++ devel/libslang/Makefile 10 Oct 2009 18:40:13 -0000
> @@ -2,14 +2,13 @@
>
> COMMENT= stack-based interpreter for terminal applications
>
> -VERSION= 1.4.9
> -DISTNAME= slang-${VERSION}
> -PKGNAME= libslang-${VERSION}p3
> -SHARED_LIBS= slang 14.9
> +DISTNAME= slang-2.2.1
> +PKGNAME= lib${DISTNAME}
> +SHARED_LIBS= slang 15.0
>
> CATEGORIES= devel
> -MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
> - http://gd.tuwien.ac.at/editors/davis/slang/v1.4/
> +MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v2.2/ \
> + ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/
>
> HOMEPAGE= http://www.s-lang.org/
>
> @@ -19,8 +18,14 @@ PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
>
> -AUTOCONF_VERSION= 2.13
> +WANTLIB= c m termcap z
> +
> +LIB_DEPENDS= pcre::devel/pcre
> +MODULES= converters/libiconv
> +
> +AUTOCONF_VERSION= 2.61
> CONFIGURE_STYLE= autoconf no-autoheader
> +AUTOCONF_DIR= ${WRKSRC}/autoconf
> MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf
>
> REGRESS_TARGET= runtests
> @@ -29,10 +34,8 @@ REGRESS_FLAGS= TCAPLIB="-ltermlib"
> MAKE_ENV= LIBslang_MAJOR=${LIBslang_VERSION:R} \
> LIBslang_MINOR=${LIBslang_VERSION:E}
>
> -pre-patch:
> -.for f in aclocal.m4 configure.in
> - @cd ${WRKSRC} && ln -sf autoconf/${f} ${f}
> -.endfor
> +pre-configure:
> + cd ${AUTOCONF_DIR}; cp configure ..
>
> .include <bsd.port.mk>
>
> Index: devel/libslang/distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/libslang/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- devel/libslang/distinfo 5 Apr 2007 15:37:56 -0000 1.6
> +++ devel/libslang/distinfo 10 Oct 2009 18:40:13 -0000
> @@ -1,5 +1,5 @@
> -MD5 (slang-1.4.9.tar.gz) = xzqmKy0bIVylWnM32qP1Qw==
> -RMD160 (slang-1.4.9.tar.gz) = nPxrcIlmGNmde1Bbk789nf33Two=
> -SHA1 (slang-1.4.9.tar.gz) = 8Cpg6OdUvdA2d/bRybVwDCGQgho=
> -SHA256 (slang-1.4.9.tar.gz) = OWnbr96smNB4hV0p9HqNq5QfF4knTNCYGotADDl4Vfg=
> -SIZE (slang-1.4.9.tar.gz) = 805990
> +MD5 (slang-2.2.1.tar.gz) = mnJCDfKqexkyoZXG5ahUZQ==
> +RMD160 (slang-2.2.1.tar.gz) = BP6h+UljFDU2FWlNyoWKV6zZJ+I=
> +SHA1 (slang-2.2.1.tar.gz) = gUT20DYsjeIgbDD8K9z3PaQerzg=
> +SHA256 (slang-2.2.1.tar.gz) = oimy7HJE04Ir1O2UonAozzdfyZ2aIZTQy2r+QshpSzU=
> +SIZE (slang-2.2.1.tar.gz) = 1688579
> Index: devel/libslang/patches/patch-autoconf_aclocal_m4
> ===================================================================
> RCS file: /cvs/ports/devel/libslang/patches/patch-autoconf_aclocal_m4,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-autoconf_aclocal_m4
> --- devel/libslang/patches/patch-autoconf_aclocal_m4 7 Jan 2006 14:19:29
> -0000 1.4
> +++ devel/libslang/patches/patch-autoconf_aclocal_m4 10 Oct 2009 18:40:13
> -0000
> @@ -1,49 +1,46 @@
> -$OpenBSD: patch-autoconf_aclocal_m4,v 1.4 2006/01/07 14:19:29 bernd Exp $
> ---- autoconf/aclocal.m4.orig Sun Mar 23 08:06:40 2003
> -+++ autoconf/aclocal.m4 Sat Jan 7 14:36:59 2006
> -@@ -86,7 +86,7 @@ case "$host_os" in
> - fi
> - fi
> - ;;
> -- *osf*)
> -+ *osf* | *openbsd*)
> - if test "X$GCC" = Xyes
> - then
> - RPATH="-Wl,-rpath,"
> -@@ -482,8 +482,8 @@ AC_CHECK_HEADER(dlfcn.h,[
> - AC_SUBST(DYNAMIC_LINK_LIB)
> +$OpenBSD$
> +--- autoconf/aclocal.m4.orig Mon Sep 7 03:10:49 2009
> ++++ autoconf/aclocal.m4 Sat Oct 10 13:54:45 2009
> +@@ -570,13 +570,13 @@ fi
>
> + dnl #Some defaults
> ELFLIB="lib\$(THIS_LIB).so"
> -ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
> --ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
> +-ELFLIB_MAJOR_MINOR="\$(ELFLIB_MAJOR).\$(ELF_MINOR_VERSION)"
> +ELFLIB_MAJOR="\$(ELFLIB).\$(LIBslang_MAJOR)"
> +ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(LIBslang_MAJOR).\$(LIBslang_MINOR)"
> + ELFLIB_MAJOR_MINOR_MICRO="\$(ELFLIB_MAJOR_MINOR).\$(ELF_MICRO_VERSION)"
>
> - case "$host_os" in
> - *linux* )
> -@@ -571,6 +571,25 @@ case "$host_os" in
> - ELFLIB="lib\$(THIS_LIB).dylib"
> - ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib"
> -
> ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib"
> -+ ;;
> -+ *openbsd* )
> -+ DYNAMIC_LINK_FLAGS=""
> -+ ELF_CC="$CC"
> -+ case `arch -s` in
> -+ sparc64)
> -+ ELF_CFLAGS="$CFLAGS -fPIC"
> -+ ;;
> -+ *)
> -+ ELF_CFLAGS="$CFLAGS -fpic"
> -+ ;;
> -+ esac
> -+ ELF_LINK="$CC -shared $ELF_CFLAGS"
> -+ ELF_LINK_CMD="\$(ELF_LINK)"
> -+ ELF_DEP_LIBS=
> -+ CC_SHARED="$CC -shared $ELF_CFLAGS"
> -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
> -+ DYNAMIC_LINK_FLAGS="-Wl,-E"
> -+ fi
> - ;;
> + dnl# This specifies the target to use in the makefile to install the shared
> library
> + INSTALL_ELFLIB_TARGET="install-elf-and-links"
> +-ELFLIB_BUILD_NAME="\$(ELFLIB_MAJOR_MINOR_MICRO)"
> ++ELFLIB_BUILD_NAME="\$(ELFLIB_MAJOR_MINOR)"
> + INSTALL_MODULE="\$(INSTALL_DATA)"
> + SLANG_DLL_CFLAGS=""
> + M_LIB="-lm"
> +@@ -701,6 +701,25 @@ case "$host_os" in
> + ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1
> -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)"
> + ELF_DEP_LIBS="\$(DL_LIB)"
> + CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
> ++ ;;
> ++ *openbsd* )
> ++ DYNAMIC_LINK_FLAGS=""
> ++ ELF_CC="$CC"
> ++ case `arch -s` in
> ++ sparc64)
> ++ ELF_CFLAGS="$CFLAGS -fPIC"
> ++ ;;
> ++ *)
> ++ ELF_CFLAGS="$CFLAGS -fpic"
> ++ ;;
> ++ esac
> ++ ELF_LINK="$CC -shared $ELF_CFLAGS"
> ++ ELF_LINK_CMD="\$(ELF_LINK)"
> ++ ELF_DEP_LIBS=
> ++ CC_SHARED="$CC -shared $ELF_CFLAGS"
> ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
> ++ DYNAMIC_LINK_FLAGS="-Wl,-E"
> ++ fi
> + ;;
> * )
> echo "Note: ELF compiler for host_os=$host_os may be wrong"
> Index: devel/libslang/patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/devel/libslang/patches/patch-src_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_Makefile_in
> --- devel/libslang/patches/patch-src_Makefile_in 7 Jan 2006 14:19:29
> -0000 1.1
> +++ devel/libslang/patches/patch-src_Makefile_in 10 Oct 2009 18:40:13
> -0000
> @@ -1,11 +1,11 @@
> ---- src/Makefile.in.orig Sun Feb 10 02:39:19 2002
> -+++ src/Makefile.in Tue May 7 19:57:00 2002
> -@@ -38,7 +38,7 @@ prefix = @prefix@
> - exec_prefix = @exec_prefix@
> +--- src/Makefile.in.orig Mon Sep 7 02:10:49 2009
> ++++ src/Makefile.in Wed Sep 9 21:57:37 2009
> +@@ -45,7 +45,7 @@ exec_prefix = @exec_prefix@
> install_lib_dir = @libdir@
> + install_bin_dir = @bindir@
> install_include_dir = @includedir@
> --install_doc_dir = $(prefix)/doc/slang
> -+install_doc_dir = $(prefix)/share/doc/slang
> +-install_doc_dir = $(prefix)/share/doc/slang/v...@slang_major_version@
> ++install_doc_dir = $(prefix)/share/doc/slang/
> DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
> - MODULE_INSTALL_DIR = @libdir@/slang/modules
> + MODULE_INSTALL_DIR = @libdir@/slang/v...@slang_major_version@/modules
> #---------------------------------------------------------------------------
> Index: devel/libslang/pkg/PFRAG.shared
> ===================================================================
> RCS file: /cvs/ports/devel/libslang/pkg/PFRAG.shared,v
> retrieving revision 1.11
> diff -u -p -r1.11 PFRAG.shared
> --- devel/libslang/pkg/PFRAG.shared 7 Jan 2006 14:19:29 -0000 1.11
> +++ devel/libslang/pkg/PFRAG.shared 10 Oct 2009 18:40:13 -0000
> @@ -1,2 +1,15 @@
> @comment $OpenBSD: PFRAG.shared,v 1.11 2006/01/07 14:19:29 bernd Exp $
> +...@comment lib/libslang.so
> @lib lib/libslang.so.${LIBslang_VERSION}
> +lib/slang/v2/modules/fcntl-module.so
> +lib/slang/v2/modules/fork-module.so
> +lib/slang/v2/modules/iconv-module.so
> +lib/slang/v2/modules/pcre-module.so
> +lib/slang/v2/modules/rand-module.so
> +lib/slang/v2/modules/select-module.so
> +lib/slang/v2/modules/slsmg-module.so
> +lib/slang/v2/modules/socket-module.so
> +lib/slang/v2/modules/sysconf-module.so
> +lib/slang/v2/modules/termios-module.so
> +lib/slang/v2/modules/varray-module.so
> +lib/slang/v2/modules/zlib-module.so
> Index: devel/libslang/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/libslang/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -r1.14 PLIST
> --- devel/libslang/pkg/PLIST 19 Apr 2005 09:41:42 -0000 1.14
> +++ devel/libslang/pkg/PLIST 10 Oct 2009 18:40:13 -0000
> @@ -1,17 +1,114 @@
> @comment $OpenBSD: PLIST,v 1.14 2005/04/19 09:41:42 espie Exp $
> %%SHARED%%
> +...@bin bin/slsh
> include/slang.h
> include/slcurses.h
> -lib/libslang.a
> -...@endfake
> +...@comment lib/libslang.so.15
> +lib/slang/
> +lib/slang/v2/
> +lib/slang/v2/modules/
> +...@man man/man1/slsh.1
> share/doc/slang/
> share/doc/slang/COPYING
> -share/doc/slang/COPYING.ART
> -share/doc/slang/COPYING.GPL
> -share/doc/slang/COPYRIGHT
> share/doc/slang/changes.txt
> share/doc/slang/cref.txt
> share/doc/slang/cslang.txt
> share/doc/slang/slang.txt
> share/doc/slang/slangdoc.html
> share/doc/slang/slangfun.txt
> +share/doc/slsh/
> +share/doc/slsh/html/
> +share/doc/slsh/html/slshfun-1.html
> +share/doc/slsh/html/slshfun-2.html
> +share/doc/slsh/html/slshfun-3.html
> +share/doc/slsh/html/slshfun-4.html
> +share/doc/slsh/html/slshfun-5.html
> +share/doc/slsh/html/slshfun-6.html
> +share/doc/slsh/html/slshfun-7.html
> +share/doc/slsh/html/slshfun-8.html
> +share/doc/slsh/html/slshfun-9.html
> +share/doc/slsh/html/slshfun.html
> +share/slsh/
> +share/slsh/arrayfuns.sl
> +share/slsh/autoload.sl
> +share/slsh/cmaps/
> +share/slsh/cmaps/cool.map
> +share/slsh/cmaps/copper.map
> +share/slsh/cmaps/drywet.map
> +share/slsh/cmaps/ds9b.map
> +share/slsh/cmaps/ds9sls.map
> +share/slsh/cmaps/gebco.map
> +share/slsh/cmaps/globe.map
> +share/slsh/cmaps/gray.map
> +share/slsh/cmaps/haxby.map
> +share/slsh/cmaps/hot.map
> +share/slsh/cmaps/jet.map
> +share/slsh/cmaps/no_green.map
> +share/slsh/cmaps/ocean.map
> +share/slsh/cmaps/polar.map
> +share/slsh/cmaps/rainbow.map
> +share/slsh/cmaps/red2green.map
> +share/slsh/cmaps/relief.map
> +share/slsh/cmaps/sealand.map
> +share/slsh/cmaps/seis.map
> +share/slsh/cmaps/split.map
> +share/slsh/cmaps/topo.map
> +share/slsh/cmaps/wysiwyg.map
> +share/slsh/cmdopt.sl
> +share/slsh/fcntl.sl
> +share/slsh/fork.sl
> +share/slsh/glob.sl
> +share/slsh/help/
> +share/slsh/help/arrayfuns.hlp
> +share/slsh/help/cmdopt.hlp
> +share/slsh/help/forkfuns.hlp
> +share/slsh/help/glob.hlp
> +share/slsh/help/onigfuns.hlp
> +share/slsh/help/pcrefuns.hlp
> +share/slsh/help/pngfuns.hlp
> +share/slsh/help/print.hlp
> +share/slsh/help/process.hlp
> +share/slsh/help/profile.hlp
> +share/slsh/help/randfuns.hlp
> +share/slsh/help/readascii.hlp
> +share/slsh/help/require.hlp
> +share/slsh/help/sockfuns.hlp
> +share/slsh/help/structfuns.hlp
> +share/slsh/iconv.sl
> +share/slsh/local-packages/
> +share/slsh/onig.sl
> +share/slsh/pcre.sl
> +share/slsh/png.sl
> +share/slsh/print.sl
> +share/slsh/process.sl
> +share/slsh/profile.sl
> +share/slsh/rand.sl
> +share/slsh/readascii.sl
> +share/slsh/require.sl
> +share/slsh/rline/
> +share/slsh/rline/complete.sl
> +share/slsh/rline/editfuns.sl
> +share/slsh/rline/emacskeys.sl
> +share/slsh/rline/history.sl
> +share/slsh/rline/slrline.rc
> +share/slsh/rline/vikeys.sl
> +share/slsh/scripts/
> +share/slsh/scripts/jpegsize
> +share/slsh/scripts/lsrpm
> +share/slsh/scripts/sldb
> +share/slsh/scripts/slprof
> +share/slsh/scripts/svnsh
> +share/slsh/select.sl
> +share/slsh/sldb.sl
> +share/slsh/sldbcore.sl
> +share/slsh/sldbsock.sl
> +share/slsh/slshhelp.sl
> +share/slsh/slshrl.sl
> +share/slsh/slsmg.sl
> +share/slsh/socket.sl
> +share/slsh/stkcheck.sl
> +share/slsh/structfuns.sl
> +share/slsh/sysconf.sl
> +share/slsh/termios.sl
> +share/slsh/varray.sl
> +share/slsh/zlib.sl
>