Attachment 88456 Details for Bug 125255 – devel_libslang2-postreview.diff

[patch] devel_libslang2-postreview.diff

devel_libslang2-postreview.diff (text/plain), 53.88 KB, created by pgollucci on 2008-08-22 14:09:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pgollucci

Created: 2008-08-22 14:09:45 UTC

Size: 53.88 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>RCS file: /home/ncvs/ports/UPDATING,v
>retrieving revision 1.695
>diff -u -r1.695 UPDATING
>--- UPDATING	8 Aug 2008 14:57:37 -0000	1.695
>+++ UPDATING	22 Aug 2008 13:07:24 -0000
>@@ -6,6 +6,20 @@
> time you update your ports collection, before attempting any port
> upgrades.
> 
>+20080811:
>+  AFFECTS: users of devel/libslang and other dependent ports
>+  AUTHOR: pgollucci@FreeBSD.org
>+
>+  Obsolete devel/libslang in favor of devel/libslang2.
>+  WITH_SLANG2 is no longer a valid port make option.
>+  Update devel/libslang before updating other ports as follows:
>+
>+    portmaster -o devel/libslang devel/libslang2
>+
>+  or 
>+  
>+    portupgrade -o devel/libslang devel/libslang2
>+
> 20080808
>   AFFECTS: users of chinese/phpbb-tw
>   AUTHOR: chinsan@FreeBSD.org
>Index: comms/hf/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/comms/hf/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- comms/hf/Makefile	11 Jun 2008 15:46:06 -0000	1.10
>+++ comms/hf/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,9 +7,9 @@
> 
> PORTNAME=	hf
> PORTVERSION=	0.8
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	comms hamradio
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	hfterm
> 
> MAINTAINER=	db@FreeBSD.org
>Index: misc/zaptel/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/misc/zaptel/Makefile,v
>retrieving revision 1.34
>diff -u -r1.34 Makefile
>--- misc/zaptel/Makefile	6 Jun 2008 13:45:40 -0000	1.34
>+++ misc/zaptel/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	zaptel
> PORTVERSION=	1.4.6
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	misc kld
> MASTER_SITES=	http://www.pbxpress.com/~gonzo/
> DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
>Index: lang/harbour/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/lang/harbour/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- lang/harbour/Makefile	17 Oct 2007 10:12:43 -0000	1.10
>+++ lang/harbour/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,21 +7,20 @@
> 
> PORTNAME=	harbour
> PORTVERSION=	0.44.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang
> MASTER_SITES=	ftp://ftp.jsd0.com/public/harbour/dgh/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An open source Clipper-compatible compiler
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
> # Not 64-bit clean
> ONLY_FOR_ARCHS=	i386
> WRKSRC=		${WRKDIR}
> USE_BISON=	build
> USE_GMAKE=	yes
>-NO_INSTALL_MANPAGES=yes
> NOPRECIOUSMAKEVARS=yes
> 
> HB_DIR=		${WRKDIR}/${PORTNAME}
>Index: news/slrn/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/news/slrn/Makefile,v
>retrieving revision 1.48
>diff -u -r1.48 Makefile
>--- news/slrn/Makefile	6 Jun 2008 13:55:03 -0000	1.48
>+++ news/slrn/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -6,30 +6,23 @@
> #
> 
> PORTNAME=	slrn
>-PORTVERSION=	0.9.8.1
>+PORTVERSION=	0.9.9
> PORTREVISION=	1
> CATEGORIES=	news ipv6
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
>-		ftp://angel.sovam.com/pub/tools/net/news/ \
>-		ftp://ftp.fu-berlin.de/pub/unix/news/slrn/ \
>-		ftp://ftp.ntua.gr/pub/lang/slang/slrn/ \
>-		ftp://ftp.plig.org/pub/slrn/
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>-
>-PATCH_SITES=	http://slrn.sourceforge.net/patches/
>-PATCHFILES=	slrn-0.9.8.1-fetch.diff \
>-		slrn-0.9.8.1-lastchar2.diff
>-PATCH_DIST_STRIP=	-p1
>+MASTER_SITES=	SF
> 
> MAINTAINER=	shaun@FreeBSD.org
> COMMENT=	SLang-based newsreader
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
>-USE_BZIP2=	yes
> USE_GMAKE=	yes
> USE_ICONV=	yes
> 
>+.if defined(NOPORTDOCS)
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src__Makefile.in
>+.endif
>+
> .if defined(WITHOUT_NLS)
> CONFIGURE_ARGS+=	--disable-nls
> PLIST_SUB+=	NLS="@comment "
>@@ -38,11 +31,6 @@
> PLIST_SUB+=	NLS=""
> .endif
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	--enable-ipv6 --disable-inews --with-slrnpull \
>-			--with-libiconv-prefix=${LOCALBASE}
>-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
>-
> .if !defined(WITHOUT_SSL)
> USE_OPENSSL=	YES
> CONFIGURE_ARGS+=	--with-ssl
>@@ -53,18 +41,24 @@
> CONFIGURE_ARGS+=	--with-uudeview
> .endif
> 
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=	--enable-ipv6 --disable-inews --with-slrnpull \
>+			--with-libiconv-prefix=${LOCALBASE}
>+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
>+
> ALL_TARGET=	all
> 
> MAN1=		slrn.1 slrnpull.1
> 
>-.if defined(NOPORTDOCS)
>-MAKE_ENV+=	NOPORTDOCS=yes
>+.if !defined(NOPORTDOCS)
>+PORTDOCS=	*
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
>-		${WRKSRC}/src/slrnfeat.h
> 	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
> 		${WRKSRC}/src/jdmacros.h
>+post-configure:
>+	@${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
>+		${WRKSRC}/src/slrnfeat.h
> 
> .include <bsd.port.mk>
>Index: news/slrn/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/news/slrn/distinfo,v
>retrieving revision 1.27
>diff -u -r1.27 distinfo
>--- news/slrn/distinfo	23 Jan 2006 23:46:38 -0000	1.27
>+++ news/slrn/distinfo	22 Aug 2008 13:07:24 -0000
>@@ -1,9 +1,3 @@
>-MD5 (slrn-0.9.8.1.tar.bz2) = 9b613007df537444a5f8a4a2994fadb7
>-SHA256 (slrn-0.9.8.1.tar.bz2) = 46968e442ece567b7928faefa0774f675761b474be80e9487235c20f50a9fd05
>-SIZE (slrn-0.9.8.1.tar.bz2) = 1034332
>-MD5 (slrn-0.9.8.1-fetch.diff) = 969471685aa7412bc60869649312618f
>-SHA256 (slrn-0.9.8.1-fetch.diff) = 0ae228075f15977f0d063cd60ef89be3c984692eed75ea7aa3ebb3bb59d7e243
>-SIZE (slrn-0.9.8.1-fetch.diff) = 920
>-MD5 (slrn-0.9.8.1-lastchar2.diff) = 01717350eabdcda662ff2444d8b3e560
>-SHA256 (slrn-0.9.8.1-lastchar2.diff) = 940e6a10cfb2ee97a6d0ae1b7af8d0744a40fd627db86bf44e8e1a9f2f20f3b8
>-SIZE (slrn-0.9.8.1-lastchar2.diff) = 4732
>+MD5 (slrn-0.9.9.tar.gz) = 87c0172887bf6e020759bf6241c003fc
>+SHA256 (slrn-0.9.9.tar.gz) = fea654bdd7f9577dc4f50cc69b8928b3e5b283652bd022ec5265a4da88d944a4
>+SIZE (slrn-0.9.9.tar.gz) = 1532550
>Index: news/slrn/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/news/slrn/pkg-plist,v
>retrieving revision 1.11
>diff -u -r1.11 pkg-plist
>--- news/slrn/pkg-plist	5 May 2006 06:46:38 -0000	1.11
>+++ news/slrn/pkg-plist	22 Aug 2008 13:07:24 -0000
>@@ -1,31 +1,5 @@
> bin/slrn
> bin/slrnpull
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/FIRST_STEPS
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/README.GroupLens
>-%%PORTDOCS%%%%DOCSDIR%%/README.SSL
>-%%PORTDOCS%%%%DOCSDIR%%/README.macros
>-%%PORTDOCS%%%%DOCSDIR%%/README.multiuser
>-%%PORTDOCS%%%%DOCSDIR%%/THANKS
>-%%PORTDOCS%%%%DOCSDIR%%/changes.txt
>-%%PORTDOCS%%%%DOCSDIR%%/help.txt
>-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
>-%%PORTDOCS%%%%DOCSDIR%%/score.sl
>-%%PORTDOCS%%%%DOCSDIR%%/score.txt
>-%%PORTDOCS%%%%DOCSDIR%%/slrn-doc.html
>-%%PORTDOCS%%%%DOCSDIR%%/slrn.rc
>-%%PORTDOCS%%%%DOCSDIR%%/slrnfuns.txt
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/README
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/README.offline
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/SETUP
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/score
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/setgid.txt
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrn.rc
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrnpull.conf
>-%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrnpull.sh
> %%NLS%%share/locale/be/LC_MESSAGES/slrn.mo
> %%NLS%%share/locale/da/LC_MESSAGES/slrn.mo
> %%NLS%%share/locale/de/LC_MESSAGES/slrn.mo
>@@ -39,21 +13,20 @@
> %%NLS%%share/locale/ru/LC_MESSAGES/slrn.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/slrn.mo
> %%NLS%%share/locale/tr/LC_MESSAGES/slrn.mo
>-%%DATADIR%%/macros/color.sl
>-%%DATADIR%%/macros/gsort.sl
>-%%DATADIR%%/macros/ispell.sl
>-%%DATADIR%%/macros/latin2.sl
>-%%DATADIR%%/macros/multipart.sl
>-%%DATADIR%%/macros/nn.sl
>-%%DATADIR%%/macros/posthook.sl
>-%%DATADIR%%/macros/search.sl
>-%%DATADIR%%/macros/tin-art.sl
>-%%DATADIR%%/macros/tin-group.sl
>-%%DATADIR%%/macros/ttyprint.sl
>-%%DATADIR%%/macros/util.sl
>-%%DATADIR%%/macros/varset.sl
>-%%DATADIR%%/macros/xcomment.sl
>-@dirrm %%DATADIR%%/macros
>+%%DATADIR%%/slang/slrn.sl
>+%%DATADIR%%/slang/color.sl
>+%%DATADIR%%/slang/gsort.sl
>+%%DATADIR%%/slang/ispell.sl
>+%%DATADIR%%/slang/latin2.sl
>+%%DATADIR%%/slang/multipart.sl
>+%%DATADIR%%/slang/nn.sl
>+%%DATADIR%%/slang/posthook.sl
>+%%DATADIR%%/slang/search.sl
>+%%DATADIR%%/slang/tin-art.sl
>+%%DATADIR%%/slang/tin-group.sl
>+%%DATADIR%%/slang/ttyprint.sl
>+%%DATADIR%%/slang/util.sl
>+%%DATADIR%%/slang/varset.sl
>+%%DATADIR%%/slang/xcomment.sl
>+@dirrm %%DATADIR%%/slang
> @dirrm %%DATADIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/slrnpull
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: news/slrn/files/extra-patch-src__Makefile.in
>===================================================================
>RCS file: news/slrn/files/extra-patch-src__Makefile.in
>diff -N news/slrn/files/extra-patch-src__Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ news/slrn/files/extra-patch-src__Makefile.in	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,26 @@
>+--- ./src/Makefile.in.orig	2008-03-03 19:39:26.000000000 +0000
>++++ ./src/Makefile.in	2008-08-13 06:52:17.000000000 +0000
>+@@ -71,11 +71,11 @@
>+  -DNLS_LOCALEDIR=\"$(LOCALEDIR)\"
>+ 
>+ # Files to install in DOC_DIR:
>+-DOCDIR_FILES = `cat ../doc/INSTFILES`
>+-UP_DOC_FILES = COPYRIGHT COPYING README changes.txt
>++DOCDIR_FILES = 
>++UP_DOC_FILES =
>+ MAN_FILES = ../doc/slrn.1 @MAN_SLRNPULL@
>+ SLANG_FILES = `cat ../macros/INSTFILES`
>+-SLRNPULL_DOCS = ../slrnpull/*
>++SLRNPULL_DOCS = 
>+ CONF_FILES = #../lib/slrn.conf (Note: uncomment DEST_CONFDIR setting if non-empty)
>+ 
>+ #----------------------------------------------------------------------------
>+@@ -145,8 +145,6 @@
>+ 	cd ../po; $(MAKE) distclean
>+ installdirs:
>+ 	$(MKINSDIR) $(DEST_BINDIR)
>+-	$(MKINSDIR) $(DEST_DOCDIR)
>+-	$(MKINSDIR) $(DEST_DOCDIR)/slrnpull
>+ 	$(MKINSDIR) $(DEST_MANDIR)/man1
>+ 	$(MKINSDIR) $(DEST_SLRN_LIB_DIR)
>+ 	$(MKINSDIR) $(DEST_SLRN_SLANG_DIR)
>Index: news/slrn/files/patch-Makefile.in
>===================================================================
>RCS file: news/slrn/files/patch-Makefile.in
>diff -N news/slrn/files/patch-Makefile.in
>--- news/slrn/files/patch-Makefile.in	7 Nov 2004 16:45:51 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,30 +0,0 @@
>---- Makefile.in.orig	Thu Oct  7 00:30:27 2004
>-+++ Makefile.in	Fri Nov  5 21:57:51 2004
>-@@ -243,6 +243,7 @@
>- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
>- uninstall-info-am:
>- install-docDATA: $(doc_DATA)
>-+ifndef NOPORTDOCS
>- 	@$(NORMAL_INSTALL)
>- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
>- 	@list='$(doc_DATA)'; for p in $$list; do \
>-@@ -251,6 +252,7 @@
>- 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
>- 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
>- 	done
>-+endif
>- 
>- uninstall-docDATA:
>- 	@$(NORMAL_UNINSTALL)
>-@@ -524,9 +526,11 @@
>- all-am: Makefile $(DATA) all-local
>- installdirs: installdirs-recursive
>- installdirs-am:
>-+ifndef NOPORTDOCS
>- 	for dir in "$(DESTDIR)$(docdir)"; do \
>- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
>- 	done
>-+endif
>- install: install-recursive
>- install-exec: install-exec-recursive
>- install-data: install-data-recursive
>Index: news/slrn/files/patch-doc::Makefile.in
>===================================================================
>RCS file: news/slrn/files/patch-doc::Makefile.in
>diff -N news/slrn/files/patch-doc::Makefile.in
>--- news/slrn/files/patch-doc::Makefile.in	7 Nov 2004 16:45:51 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,46 +0,0 @@
>---- doc/Makefile.in.orig	Thu Oct  7 00:30:28 2004
>-+++ doc/Makefile.in	Fri Nov  5 21:40:07 2004
>-@@ -268,6 +268,7 @@
>- 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
>- 	done
>- install-docDATA: $(doc_DATA)
>-+ifndef NOPORTDOCS
>- 	@$(NORMAL_INSTALL)
>- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
>- 	@list='$(doc_DATA)'; for p in $$list; do \
>-@@ -276,6 +277,7 @@
>- 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
>- 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
>- 	done
>-+endif
>- 
>- uninstall-docDATA:
>- 	@$(NORMAL_UNINSTALL)
>-@@ -447,9 +449,11 @@
>- all-am: Makefile $(MANS) $(DATA)
>- installdirs: installdirs-recursive
>- installdirs-am:
>-+ifndef NOPORTDOCS
>- 	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
>- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
>- 	done
>-+endif
>- install: install-recursive
>- install-exec: install-exec-recursive
>- install-data: install-data-recursive
>-@@ -542,6 +546,7 @@
>- 
>- 
>- install-data-local:
>-+ifndef NOPORTDOCS
>- 	@if test "x$(SLRNPULL)" = "xslrnpull"; then \
>- 	$(mkinstalldirs) $(DESTDIR)$(docdir)/slrnpull; \
>- 	list='$(PULLDOCS)'; for p in $$list; do \
>-@@ -551,6 +556,7 @@
>- 	  fi; \
>- 	done; \
>- 	fi;
>-+endif
>- 
>- uninstall-local:
>- 	list='$(PULLDOCS)'; for p in $$list; do \
>Index: www/asterisk-gui/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/asterisk-gui/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- www/asterisk-gui/Makefile	6 Jun 2008 14:06:46 -0000	1.9
>+++ www/asterisk-gui/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	asterisk-gui
> PORTVERSION=	0.0.1r20070801
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> DISTNAME=	${PORTNAME}-snap-2007-08-01
>Index: net/asterisk-bristuff/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/asterisk-bristuff/Makefile,v
>retrieving revision 1.70
>diff -u -r1.70 Makefile
>--- net/asterisk-bristuff/Makefile	25 Jul 2008 12:24:04 -0000	1.70
>+++ net/asterisk-bristuff/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	asterisk
> PORTVERSION=	1.2.13
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	net
> MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
> 		http://ftp.digium.com/pub/asterisk/old-releases/
>Index: editors/lpe/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/lpe/Makefile,v
>retrieving revision 1.36
>diff -u -r1.36 Makefile
>--- editors/lpe/Makefile	6 Jun 2008 13:25:51 -0000	1.36
>+++ editors/lpe/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,16 +7,16 @@
> 
> PORTNAME=	lpe
> PORTVERSION=	1.2.6
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	editors
> MASTER_SITES=	ftp://ftp.sasknow.com/pub/ \
> 		ftp://ftp.twu.net/users/cdsmith/lpe/
> MASTER_SITE_SUBDIR=	${PORTNAME}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	A "lightweight programmer's editor" with syntax highlighting
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
> USE_AUTOTOOLS=	libtool:15
> USE_GETTEXT=	yes
>Index: editors/lpe/files/patch-src__cfg.c
>===================================================================
>RCS file: editors/lpe/files/patch-src__cfg.c
>diff -N editors/lpe/files/patch-src__cfg.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ editors/lpe/files/patch-src__cfg.c	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,11 @@
>+--- ./src/cfg.c.orig	2008-08-08 07:51:20.000000000 +0000
>++++ ./src/cfg.c	2008-08-08 07:52:05.000000000 +0000
>+@@ -37,7 +37,7 @@
>+ 	if (SLang_load_file (DATADIR "/lpe/init.sl") == -1)
>+ 	{
>+ 	    SLang_restart (1);
>+-	    SLang_Error = 0;
>++	    SLang_set_error(0);
>+ 	}
>+     }
>+ }
>Index: editors/lpe/files/patch-src__input.c
>===================================================================
>RCS file: editors/lpe/files/patch-src__input.c
>diff -N editors/lpe/files/patch-src__input.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ editors/lpe/files/patch-src__input.c	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,11 @@
>+--- ./src/input.c.orig	2008-08-08 07:51:24.000000000 +0000
>++++ ./src/input.c	2008-08-08 07:51:48.000000000 +0000
>+@@ -2262,7 +2262,7 @@
>+     SLang_load_string (cmd);
>+     /* to avoid slang stack overflows... */
>+     SLang_restart (1);
>+-    SLang_Error = 0;
>++    SLang_set_error(0);
>+ 
>+     /* 
>+      * This is not the nicest thing to do, but certain slang commnds,
>Index: audio/timidity++-slang/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/audio/timidity++-slang/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- audio/timidity++-slang/Makefile	22 Mar 2007 16:59:23 -0000	1.9
>+++ audio/timidity++-slang/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,10 +7,10 @@
> 
> PKGNAMESUFFIX=	-slang
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	Slang interface for TiMidity++
> 
>-MASTERDIR=	${.CURDIR}/../..//audio/timidity++
>+MASTERDIR=	${.CURDIR}/../../audio/timidity++
> 
> PLIST_FILES=	${TIMID_LIBDIR}/interface_s.so
> 
>Index: net/yate-devel/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/yate-devel/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- net/yate-devel/Makefile	25 Jul 2008 12:24:06 -0000	1.5
>+++ net/yate-devel/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -8,7 +8,7 @@
> PORTNAME=	yate
> PORTVERSION=	1.3.0.p2
> DISTVERSION=	${PORTVERSION:S/.p/-/}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net comms
> MASTER_SITES=	http://cto.homelinux.net/pub/FreeBSD/ports/distfiles/ \
> 		${MASTER_SITE_LOCAL}
>@@ -46,8 +46,7 @@
> 		ZAPTEL "Zaptel hardware channel/driver support" on \
> 		FAX "Fax software channel/driver support" on
> 
>-DOCSDIR=	${LOCALBASE}/share/doc/yate
>-PORTDOCS=	${DOCSDIR}/*
>+PORTDOCS=	*
> PLIST_SUB=	BRISTUFF="@comment "
> PLIST_SUB+=	VERSION=${PORTVERSION:S/.p2//}
> SUB_FILES=	pkg-message
>@@ -120,12 +119,6 @@
> PLIST_SUB+=	WITH_FAX="@comment "
> .endif
> 
>-.if ${OSVERSION} >= 500036
>-PLIST_SUB+=	NEWGCC=""
>-.else
>-PLIST_SUB+=	NEWGCC="@comment "
>-.endif
>-
> post-patch:
> 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
> 		${WRKSRC}/modules/Makefile.in
>@@ -134,11 +127,13 @@
> 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> 
> post-install:
>+.if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
> 	@${INSTALL_DATA} files/README.too ${DOCSDIR}
>+.endif
> 	@cd ${PREFIX}/etc/${PORTNAME}; for cfg in *.sample; do test -f $${cfg%%.sample} || cp -p $${cfg} $${cfg%%.sample}; done
> 	@${CAT} ${PKGMESSAGE}
> 
>Index: net/yate-devel/pkg-deinstall
>===================================================================
>RCS file: net/yate-devel/pkg-deinstall
>diff -N net/yate-devel/pkg-deinstall
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ net/yate-devel/pkg-deinstall	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,45 @@
>+#! /bin/sh
>+
>+yesno() {
>+    local dflt question answer
>+
>+    question=$1
>+    dflt=$2
>+    while :; do
>+	answer=$(ask "${question}" "${dflt}")
>+	case "${answer}" in
>+	[Yy]*)		return 0;;
>+	[Nn]*)		return 1;;
>+	esac
>+	echo "Please answer yes or no."
>+    done
>+}
>+
>+delete_account() {
>+    local u g home
>+
>+    u=$1
>+    g=$2
>+    if yesno "Do you want me to remove group \"${g}\"" y; then
>+	pw groupdel -n ${g}
>+	echo "Done."
>+    fi
>+    if yesno "Do you want me to remove user \"${u}\"" y; then
>+	eval home=~${u}
>+	pw userdel -n ${u}
>+	echo "Done."
>+	if [ -d "${home}" ]; then
>+	    echo "Please remember to remove the home directory \"${home}\" as"
>+	    echo "well as the mirrored files."
>+	fi
>+    fi
>+}
>+
>+if [ x$2 != xDEINSTALL ]; then
>+    exit
>+fi
>+
>+export PATH=/bin:/usr/bin:/usr/sbin
>+
>+delete_account ${user} ${group}
>+delete_account ${cuser} ${cgroup}
>Index: net/yate-devel/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/net/yate-devel/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- net/yate-devel/pkg-plist	14 Mar 2008 16:00:07 -0000	1.3
>+++ net/yate-devel/pkg-plist	22 Aug 2008 13:07:24 -0000
>@@ -172,10 +172,11 @@
> sbin/yate
> sbin/yate-config
> %%WITH_X11%%share/applications/yate-gtk2.desktop
>-share/doc/yate/COPYING
>-share/doc/yate/ChangeLog
>-share/doc/yate/README
>-share/doc/yate/README.too
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/README.too
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrmtry etc/yate
> @dirrm include/yate
> %%WITH_X11%%@dirrmtry lib/menu
>Index: net-mgmt/nettop/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net-mgmt/nettop/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- net-mgmt/nettop/Makefile	1 Apr 2007 03:09:43 -0000	1.2
>+++ net-mgmt/nettop/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,13 +7,14 @@
> 
> PORTNAME=	nettop
> PORTVERSION=	0.2.3
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://srparish.net/scripts/
> 
> MAINTAINER=	leeym@FreeBSD.org
> COMMENT=	A program which looks like top, but is for network packets
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-slang-libraries=${LOCALBASE}/lib \
>Index: japanese/asterisk-sound/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/japanese/asterisk-sound/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- japanese/asterisk-sound/Makefile	6 Jun 2008 13:37:25 -0000	1.3
>+++ japanese/asterisk-sound/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	asterisk-sounds
> PORTVERSION=	1.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	japanese net
> MASTER_SITES=	ftp://ftp.voip-info.jp/asterisk/sounds/
> DISTNAME=	${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta
>Index: net/astmanproxy/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/astmanproxy/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- net/astmanproxy/Makefile	6 Jun 2008 13:49:54 -0000	1.4
>+++ net/astmanproxy/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	astmanproxy
> PORTVERSION=	1.21
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	net
> MASTER_SITES=	http://www.popvox.com/
> DISTFILES=	astmanproxy-latest.tgz
>Index: misc/pdmenu/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/misc/pdmenu/Makefile,v
>retrieving revision 1.27
>diff -u -r1.27 Makefile
>--- misc/pdmenu/Makefile	2 Aug 2008 22:34:23 -0000	1.27
>+++ misc/pdmenu/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -6,14 +6,15 @@
> 
> PORTNAME=	pdmenu
> PORTVERSION=	1.2.95
>+PORTREVISION=	1
> CATEGORIES=	misc
> MASTER_SITES=	DEBIAN
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	A simple console menu program
> 
>-OPTIONS=	SLANG2 "Build using libslang-2.x" off
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>@@ -35,13 +36,6 @@
> 		%%DATADIR%%/showdir.pl
> PLIST_DIRS=	%%DATADIR%%
> 
>-.include <bsd.port.pre.mk>
>-
>-.if defined(WITH_SLANG2)
>-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
>-.else
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
>-.endif
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/pdmenu ${PREFIX}/bin
>@@ -59,4 +53,4 @@
> post-install:
> 	@${STRIP_CMD} ${PREFIX}/bin/pdmenu
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: net/astfax/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/astfax/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- net/astfax/Makefile	6 Jun 2008 13:49:54 -0000	1.5
>+++ net/astfax/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,11 +7,11 @@
> 
> PORTNAME=	astfax
> PORTVERSION=	1.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	net
> MASTER_SITES=	http://www.inter7.com/astfax/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	AstFax provides an outgoing email to fax gateway for Asterisk
> 
> LIB_DEPENDS=	spandsp.0:${PORTSDIR}/comms/spandsp
>Index: devel/erlslang/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/erlslang/Makefile,v
>retrieving revision 1.14
>diff -u -r1.14 Makefile
>--- devel/erlslang/Makefile	22 Jun 2008 18:45:19 -0000	1.14
>+++ devel/erlslang/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	erlslang
> PORTVERSION=	1.0
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	devel
> MASTER_SITES=	http://www.erlang.org/contrib/ \
> 		http://erlang.stacken.kth.se/contrib/ \
>@@ -25,13 +25,14 @@
> 
> PLIST_SUB=	VERSION="${PORTVERSION}"
> 
>+EXPIRATION_DATE=	2009-01-01
>+DEPRECATED=	Only compiles with devel/libslang with will be removed 2009-01-01
>+
> USE_GMAKE=	yes
> USE_AUTOTOOLS=	autoconf:213
> GNU_CONFIGURE=	yes
> CONFIGURE_WRKSRC=${WRKSRC}/config
> 
>-.include <bsd.port.pre.mk>
>-
> post-build:
> 	@${RM} -r ${WRKSRC}/*/CVS
> 	@${RM} -r ${WRKSRC}/*/.cvsignore
>@@ -48,4 +49,4 @@
> 	@${CP} -r ${WRKSRC}/src   ${PREFIX}/lib/erlang/lib/${DISTNAME}/src
> 	@${LN} -sf ${DISTNAME} ${PREFIX}/lib/erlang/lib/slang
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: math/slsc/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/math/slsc/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- math/slsc/Makefile	24 Sep 2003 09:37:03 -0000	1.4
>+++ math/slsc/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -18,6 +18,9 @@
> 
> GNU_CONFIGURE=	yes
> 
>+DEPRECATED=	No longer maintained by author
>+EXPIRATION_DATE=	2008-10-08
>+
> post-install:
> 	${STRIP_CMD} ${PREFIX}/bin/slsc ${PREFIX}/share/slsc/vprint
> 
>Index: net/asterisk12/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/asterisk12/Makefile,v
>retrieving revision 1.78
>diff -u -r1.78 Makefile
>--- net/asterisk12/Makefile	25 Jul 2008 12:24:04 -0000	1.78
>+++ net/asterisk12/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -8,7 +8,7 @@
> PORTNAME=	asterisk
> PORTVERSION=	1.2.27
> PKGNAMESUFFIX=	12
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
> 		http://ftp.digium.com/pub/asterisk/old-releases/
>Index: devel/gaul/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/gaul/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- devel/gaul/Makefile	1 Feb 2007 02:41:25 -0000	1.12
>+++ devel/gaul/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -8,18 +8,17 @@
> 
> PORTNAME=	gaul
> PORTVERSION=	0.1849.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}-devel-${PORTVERSION:R}-${PORTVERSION:E}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	Genetic Algorithm Utility Library
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
>-USE_AUTOTOOLS=	libtool:15
>+USE_AUTOTOOLS=	automake:19 libtool:15
> USE_BZIP2=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>@@ -31,4 +30,6 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure
> 
>+run-autotools::
>+	(cd ${WRKSRC} ; ${ACLOCAL} ; ${AUTOMAKE})
> .include <bsd.port.mk>
>Index: devel/gaul/files/patch-tests__test_slang.c
>===================================================================
>RCS file: devel/gaul/files/patch-tests__test_slang.c
>diff -N devel/gaul/files/patch-tests__test_slang.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ devel/gaul/files/patch-tests__test_slang.c	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,39 @@
>+--- ./tests/test_slang.c.orig	2008-08-08 07:38:40.000000000 +0000
>++++ ./tests/test_slang.c	2008-08-08 07:41:52.000000000 +0000
>+@@ -288,9 +288,9 @@
>+   if (-1 == SLang_load_file(script_fname))
>+     {
>+     dief("Error %d interpreting the S-Lang script \"%s\".",
>+-         SLang_Error, script_fname);
>++         SLang_get_error(), script_fname);
>+     SLang_restart(1);	/* reset interpreter. */
>+-    SLang_Error = 0;
>++    SLang_set_error(0);
>+     return FALSE;
>+     }
>+ 
>+@@ -315,9 +315,9 @@
>+  */
>+   if (-1 == SLang_load_file(NULL))
>+     {
>+-    dief("Error %d interpreting the SLang script from stdin.", SLang_Error);
>++    dief("Error %d interpreting the SLang script from stdin.", SLang_get_error());
>+     SLang_restart(1);
>+-    SLang_Error = 0;
>++    SLang_set_error(0);
>+     return FALSE;
>+     }
>+ 
>+@@ -334,10 +334,10 @@
>+     printf("STDIN line %d\n", linecount);
>+     if (-1 == SLang_load_string(buffer))
>+       {
>+-      printf("SLang_Error = %d\n", SLang_Error);
>++      printf("SLang_Error = %d\n", SLang_get_error());
>+       SLang_restart (1);
>+       }
>+-    SLang_Error = 0;
>++    SLang_set_error(0);
>+     linecount++;
>+     }
>+ #endif
>Index: editors/jed/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/jed/Makefile,v
>retrieving revision 1.34
>diff -u -r1.34 Makefile
>--- editors/jed/Makefile	2 Jun 2008 11:28:24 -0000	1.34
>+++ editors/jed/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	jed
> PORTVERSION=	0.99.18
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	editors
> MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
> 		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v${PORTVERSION:R}/ \
>@@ -19,10 +19,11 @@
> MAINTAINER=	garga@FreeBSD.org
> COMMENT=	A SLang-based text editor
> 
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
>+
> CONFLICTS=	jed-devel-[0-9]*
> 
>-OPTIONS=	X11 "Build xjed (depends of X11)" on \
>-		SLANG2 "Build using libslang-2.x" off
>+OPTIONS=	X11 "Build xjed (depends of X11)" on
> 
> USE_BZIP2=	yes
> DIST_SUBDIR=	jed
>@@ -44,12 +45,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITH_SLANG2)
>-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
>-.else
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
>-.endif
>-
> .if defined(WITHOUT_X11)
> PLIST_SUB+=	XJED="@comment "
> .else
>Index: devel/newt/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/newt/Makefile,v
>retrieving revision 1.35
>diff -u -r1.35 Makefile
>--- devel/newt/Makefile	25 Jul 2008 09:38:43 -0000	1.35
>+++ devel/newt/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	newt
> PORTVERSION=	0.51.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_LOCAL} \
> 		# ftp://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/
>@@ -17,7 +17,7 @@
> MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	Not Erik's Windowing Toolkit:  console I/O handling library#'
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2 \
> 		popt.0:${PORTSDIR}/devel/popt
> 
> GNU_CONFIGURE=	yes
>Index: games/netspades/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/netspades/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- games/netspades/Makefile	6 Jun 2008 13:31:39 -0000	1.9
>+++ games/netspades/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,14 +7,14 @@
> 
> PORTNAME=	NetSpades
> PORTVERSION=	4.2.0
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	games
> MASTER_SITES=	http://www.ece.rice.edu/~brentmh/spades/
> 
> MAINTAINER=	laszlof@FreeBSD.org
> COMMENT=	Very popular card game for 1-4 players over a network
> 
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> 
> GNU_CONFIGURE=	yes
> USE_GNOME=	gtk12
>Index: net/asterisk-addons/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/asterisk-addons/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- net/asterisk-addons/Makefile	6 Jun 2008 13:49:53 -0000	1.11
>+++ net/asterisk-addons/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	asterisk-addons
> PORTVERSION=	1.4.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	http://ftp.digium.com/pub/asterisk/releases/
> 
>Index: sysutils/slmon/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/sysutils/slmon/Makefile,v
>retrieving revision 1.24
>diff -u -r1.24 Makefile
>--- sysutils/slmon/Makefile	6 Jun 2008 14:03:20 -0000	1.24
>+++ sysutils/slmon/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -8,16 +8,15 @@
> 
> PORTNAME=	slmon
> PORTVERSION=	0.5.13
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	sysutils
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	SF
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	S-Lang System Monitor
> 
> LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
>-		slang.1:${PORTSDIR}/devel/libslang
>+		slang.2:${PORTSDIR}/devel/libslang2
> 
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>Index: net/asterisk/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/asterisk/Makefile,v
>retrieving revision 1.101
>diff -u -r1.101 Makefile
>--- net/asterisk/Makefile	25 Jul 2008 12:24:04 -0000	1.101
>+++ net/asterisk/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	asterisk
> PORTVERSION=	1.4.20.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
> 		http://ftp.digium.com/pub/asterisk/old-releases/
>Index: devel/ruby-slang/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/ruby-slang/Makefile,v
>retrieving revision 1.16
>diff -u -r1.16 Makefile
>--- devel/ruby-slang/Makefile	28 Nov 2005 04:40:21 -0000	1.16
>+++ devel/ruby-slang/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,20 +7,17 @@
> 
> PORTNAME=	slang
> PORTVERSION=	0.52
>+PORTREVISION=	2
> CATEGORIES+=	devel ruby
> MASTER_SITES=	${MASTER_SITE_LOCAL}
> MASTER_SITE_SUBDIR=	fenner/ruby-contrib
> DISTNAME=	${PORTNAME}lib-${PORTVERSION:}-1m
> DIST_SUBDIR=	ruby
> 
>-MAINTAINER?=	ports@FreeBSD.org
>+MAINTAINER?=	pgollucci@FreeBSD.org
> COMMENT?=	S-Lang extension module for Ruby
> 
>-.if defined(WITH_JAPANESE)
> LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
>-.else
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>-.endif
> 
> USE_RUBY=	yes
> USE_RUBY_EXTCONF=	yes
>Index: irc/slirc/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/irc/slirc/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- irc/slirc/Makefile	1 Apr 2006 13:23:43 -0000	1.6
>+++ irc/slirc/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,13 +7,13 @@
> 
> PORTNAME=	slirc
> PORTVERSION=	0.12
>-PORTREVISION=	1
>+PORTREVISION=	2
> # Assign with += for slave ports
> CATEGORIES+=	irc
> MASTER_SITES=	http://members.core.com/~stabro/
> EXTRACT_SUFX=	.tgz
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	A SLang-based IRC client
> 
> LIB_DEPENDS=	${LIB_DEPENDS_LIBSLANG}
>@@ -24,7 +24,7 @@
> 
> SLANG_INCDIR?=	${PREFIX}/include
> SLANG_LIBDIR?=	${PREFIX}/lib
>-LIB_DEPENDS_LIBSLANG?=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS_LIBSLANG?=	slang.2:${PORTSDIR}/devel/libslang2
> 
> MAKE_ARGS=	SLANG_INCDIR="${SLANG_INCDIR}" \
> 		SLANG_LIBDIR="${SLANG_LIBDIR}" \
>Index: irc/slirc/files/patch-slirc.c
>===================================================================
>RCS file: /home/ncvs/ports/irc/slirc/files/patch-slirc.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-slirc.c
>--- irc/slirc/files/patch-slirc.c	6 Jan 2001 18:54:09 -0000	1.1
>+++ irc/slirc/files/patch-slirc.c	22 Aug 2008 13:07:24 -0000
>@@ -1,5 +1,14 @@
>---- slirc.c.orig	Tue Aug 24 00:15:11 1999
>-+++ slirc.c	Sun Jan  7 03:17:46 2001
>+--- ./slirc.c.orig	1999-08-23 15:15:11.000000000 +0000
>++++ ./slirc.c	2008-08-11 22:25:20.246320000 +0000
>+@@ -81,7 +81,7 @@
>+    char buf[130];
>+    
>+    sprintf(buf, "Caught sig %d (%s)", signum, Top2);
>+-   SLang_doerror(buf);
>++   SLang_verror(signum, buf);
>+    if (VF_reset) SLexecute_function(VF_reset);
>+    exit(1);
>+ }
> @@ -242,7 +242,7 @@
>  {
>     char secs[8];
>@@ -28,3 +37,83 @@
>  	 strcat(SLirc_Load_Path,SCRIPTPATH); /* SCRIPTPATH defined in Makefile */
>  }
>  
>+@@ -758,7 +760,7 @@
>+ 	SLsmg_reset_smg();
>+ 	SLang_reset_tty();
>+   if (VF_reset) SLexecute_function(VF_reset);
>+-	SLang_doerror(st);
>++	SLang_verror(SL_INTRINSIC_ERROR, st);
>+ 	puts(st);
>+ 	exit(1);
>+ }
>+@@ -774,8 +776,8 @@
>+ 
>+ static void ClearSomeErrors(void)
>+ {
>+-	if (SLang_Error && SLang_Error != USER_BREAK) {
>+-		SLang_Error = 0;
>++	if (USER_BREAK != SLang_get_error()) {
>++		SLang_set_error(0);
>+ 		SLsmg_touch_lines(0, SLtt_Screen_Rows);
>+ 		SLirc_UpdateDisplay();
>+ 		SLang_input_pending(20);
>+@@ -1016,7 +1018,7 @@
>+ 	SLtt_get_terminfo();					/* Get the terminal info. */
>+ 	SLtt_Use_Ansi_Colors = 1;
>+ 	if (-1 == SLkp_init()) {
>+-		SLang_doerror("SLkp_init failed.");
>++		SLang_verror(SL_INTRINSIC_ERROR, "SLkp_init failed.");
>+ 		exit(1);
>+ 	}
>+ 
>+@@ -1026,7 +1028,7 @@
>+ 	 *   (actually, opost's ignored in slang-1.0.3 )
>+ 	 */
>+ 	if (-1 == SLang_init_tty(abort_char, 0, 0)) {
>+-		SLang_doerror("Unable to initialize the terminal.");
>++		SLang_verror(SL_INTRINSIC_ERROR, "Unable to initialize the terminal.");
>+ 		exit(1);
>+ 	}
>+ 	SLsmg_init_smg(); /* this does get_screen_size inside. */
>+@@ -1073,9 +1075,9 @@
>+ 	SetStatus("Loading SLirc init script...");
>+ 	SLirc_UpdateDisplay();
>+ 	SLang_load_file(argv[1] ? argv[1] : "init.sl");
>+-	if (SLang_Error) {
>+-		SLang_doerror("Oh, shit. Who fucked up that file, then?");
>+-		SLang_Error = 0;
>++	if (SLang_get_error()) {
>++		SLang_verror(SL_INTRINSIC_ERROR, "Oh, shit. Who fucked up that file, then?");
>++		SLang_set_error(0);
>+ 	}
>+ 	SLtt_Use_Ansi_Colors = UseColours;
>+ 	SLirc_UpdateDisplay();
>+@@ -1087,7 +1089,7 @@
>+ 	check_timed = SLang_get_function("check_timed");
>+ 	if (!check_timed) Fatal("check_timed is undefined");
>+ 	expiry = time(NULL)+5;
>+-	while (SLang_Error != USER_BREAK) {
>++	while (USER_BREAK != SLang_get_error()) {
>+ 		int r,stkdep;
>+ 		unsigned int tim;
>+ 		
>+@@ -1106,7 +1108,7 @@
>+ 		tim = time(NULL);
>+ 		if (tim<expiry) continue;
>+ 		expiry += 5;
>+-		stkdep = _SLstack_depth();
>++		stkdep = SLstack_depth();
>+ 		r = SLexecute_function(check_timed);
>+ 		if (r==-1) Fatal("SLexecute_function(check_timed)?");
>+ #		if 0
>+@@ -1114,8 +1116,8 @@
>+ 		if (!r) Fatal("check_timed is undefined");
>+ #		endif
>+ 		SLirc_UpdateDisplay();
>+-		stkdep = _SLstack_depth() - stkdep; /* % items left on stack. */
>+-		if (stkdep && SLang_Error != USER_BREAK) {
>++		stkdep = SLstack_depth() - stkdep; /* % items left on stack. */
>++		if (stkdep && USER_BREAK != SLang_get_error()) {
>+ 			SLang_verror(SL_APPLICATION_ERROR,
>+ 		  	"Eeek... check_timed() left %d units on stack",stkdep);
>+ 			if (stkdep>0) SLdo_pop_n(stkdep);
>Index: irc/slirc/files/patch-slload.c
>===================================================================
>RCS file: irc/slirc/files/patch-slload.c
>diff -N irc/slirc/files/patch-slload.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ irc/slirc/files/patch-slload.c	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,11 @@
>+--- ./slload.c.orig	2008-08-11 21:29:52.000000000 +0000
>++++ ./slload.c	2008-08-11 21:30:13.000000000 +0000
>+@@ -84,7 +84,7 @@
>+ 	SLang_free_slstring(name);
>+ 	SLdeallocate_load_type(x);
>+ 
>+-	if (SLang_Error) return -1;
>++	if (SLang_get_error()) return -1;
>+ 
>+ 	return 0;
>+ }
>Index: irc/slirc/files/patch-vfile-module.c
>===================================================================
>RCS file: /home/ncvs/ports/irc/slirc/files/patch-vfile-module.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-vfile-module.c
>--- irc/slirc/files/patch-vfile-module.c	6 Jan 2001 18:54:09 -0000	1.1
>+++ irc/slirc/files/patch-vfile-module.c	22 Aug 2008 13:07:24 -0000
>@@ -1,5 +1,178 @@
>---- vfile-module.c.orig	Tue Aug 24 00:08:56 1999
>-+++ vfile-module.c	Sat Jan  6 20:25:43 2001
>-@@ -2067 +2067 @@
>--	MAKE_ICONSTANT("O_SYNC", O_SYNC),
>-+	MAKE_ICONSTANT("O_FSYNC", O_FSYNC),
>+--- ./vfile-module.c.orig	2008-08-11 21:49:04.000000000 +0000
>++++ ./vfile-module.c	2008-08-11 22:25:20.246320000 +0000
>+@@ -97,13 +97,13 @@
>+ 	int ct;
>+ 
>+ 	if (at->data_type != SLANG_CHAR_TYPE) {
>+-		SLang_doerror("Operation requires character array");
>++		SLang_verror(SL_INTRINSIC_ERROR, "Operation requires character array");
>+ 		return -1;
>+ 	}
>+ 
>+ 	if (len<0) ct = at->num_elements;
>+ 	else if (len > at->num_elements) {
>+-		SLang_doerror("Too much data for array size");
>++		SLang_verror(SL_INTRINSIC_ERROR, "Too much data for array size");
>+ 		return -1;
>+ 	}else ct = len;
>+ 	*data = at->data;
>+@@ -446,11 +446,11 @@
>+ 
>+ 	VFerrno = 0;
>+ 	if (t->fd < 0) {
>+-		/* SLang_doerror("file already closed"); */
>++		/* SLang_verror(SL_INTRINSIC_ERROR,"file already closed"); */
>+ 		r = 0; goto return_r;
>+ 	}
>+ 	if (t->rdvf || t->wrvf) {
>+-		SLang_doerror("You must set_wrdep(*,*,0) before close");
>++		SLang_verror(SL_INTRINSIC_ERROR, "You must set_wrdep(*,*,0) before close");
>+ 		goto return_r;
>+ 	}
>+ 	r = close(t->fd);
>+@@ -1171,7 +1171,7 @@
>+ 
>+ 	l = t->rbuft - t->rbufr;
>+ 	if (l <= 0) { /* shouldn't happen */
>+-		SLang_doerror("read_into_buf() called with window=0");
>++		SLang_verror(SL_INTRINSIC_ERROR,"read_into_buf() called with window=0");
>+ 		return -1;
>+ 	}
>+ 	if (t->fd < 0 || t->flags & SJ_EOF) return 0; /* also shouldn't happen */
>+@@ -1209,7 +1209,7 @@
>+ 
>+ 	if (!l || t->rtermn < 0 || !(m = t->rbufr - t->rbufq)) goto dflt_ret;
>+ 	if (t->rbufq < t->rbufp) {
>+-		SLang_doerror("q<p");
>++		SLang_verror(SL_INTRINSIC_ERROR, "q<p");
>+ 		t->rbufq = t->rbufp;
>+ 	}
>+ 	if ( (cp = (char*)memchr(t->rbufq,t->rtermn,m))
>+@@ -1259,7 +1259,7 @@
>+ 
>+ /*fprintf(stderr,"fd=%d, rthrsh=%d, bytes=%d\n",t->fd,t->rthrsh,t->rbufr-t->rbufp); */
>+ 	if (t->fd < 0) {
>+-		SLang_doerror("Read on closed VFile");
>++		SLang_verror(SL_INTRINSIC_ERROR, "Read on closed VFile");
>+ 		goto return_r;
>+ 	}
>+ 
>+@@ -1364,7 +1364,7 @@
>+ 	
>+ 	if (!(mmt = pop_vfd(SJ_WRITE, &t))) goto free_fail; /* ct = -1 */
>+ 	if (t->fd < 0) {
>+-		SLang_doerror("Write on closed VFile");
>++		SLang_verror(SL_INTRINSIC_ERROR, "Write on closed VFile");
>+ 		goto free_fail;
>+ 	}
>+ 
>+@@ -1420,7 +1420,7 @@
>+ 	if (!(wr_mmt = pop_vfd(SJ_WRITE, &wt))) goto free1;
>+ 
>+ 	if (wt != rt->wrvf || rt != wt->rdvf) {
>+-		SLang_doerror("copybytes filepair not linked by set_wrdep()");
>++		SLang_verror(SL_INTRINSIC_ERROR, "copybytes filepair not linked by set_wrdep()");
>+ 		goto free2;
>+ 	}
>+ 
>+@@ -1469,7 +1469,7 @@
>+ 	if (!(mmt = pop_vfd(SJ_READ, &t))) return -1; /* ct = -1 */
>+ 
>+ 	if (t->fd < 0) {
>+-		SLang_doerror("Read on closed VFile");
>++		SLang_verror(SL_INTRINSIC_ERROR,"Read on closed VFile");
>+ 		r = -1; goto return_r;
>+ 	}
>+ 	r = check_buf_data(t);
>+@@ -1672,7 +1672,7 @@
>+ 		fnt = SLang_get_function(func_name);
>+ 		if (!fnt) {r = -2; goto return_r;}
>+ 		if (t->fd < 0) {
>+-			SLang_doerror("Can't set_action() on closed VFile");
>++			SLang_verror(SL_INTRINSIC_ERROR,"Can't set_action() on closed VFile");
>+ 			r = -3; goto return_r;
>+ 		}
>+ 	}
>+@@ -1720,7 +1720,7 @@
>+ 		) return -1;
>+ 
>+ 	if (t->flags & SJ_UDP) {
>+-		SLang_doerror("only default (unbuffered) rmode makes sense for UDP");
>++		SLang_verror(SL_INTRINSIC_ERROR,"only default (unbuffered) rmode makes sense for UDP");
>+ 		r = -1; goto return_r;
>+ 	}
>+ 
>+@@ -1729,7 +1729,7 @@
>+ 	if (!ct) {
>+ 		if (t->rthrsh) { /* changing from buffered to unbuffered */
>+ 			if (t->rbufr > t->rbufp) {
>+-				SLang_doerror("must read data before switching to unbuffered mode");
>++				SLang_verror(SL_INTRINSIC_ERROR,"must read data before switching to unbuffered mode");
>+ 				r = -1; goto return_r;
>+ 			}
>+ 			SLfree(t->rbuf0);
>+@@ -1737,7 +1737,7 @@
>+ 			vfile_list_dirty = 1; /* just t */
>+ 		}
>+ 		if (ch>=0) {
>+-			SLang_doerror("termination char ignored in unbuffered mode");
>++			SLang_verror(SL_INTRINSIC_ERROR,"termination char ignored in unbuffered mode");
>+ 			ch = -1;
>+ 		}
>+ 	}
>+@@ -1802,12 +1802,12 @@
>+ 	stkdep = _SLstack_depth() - stkdep; /* % items left on stack. */
>+ 	/* for some reason, this next seems to cause segfault when */
>+ 	/* used from ./vf and do_actions() is called in SLang ?!   */
>+-	if (stkdep && SLang_Error != USER_BREAK) {
>++	if (stkdep && USER_BREAK != SLang_get_error()) {
>+ 		SLang_verror(SL_APPLICATION_ERROR,
>+ 		  "Eeek... %s() left %d units on stack",t->fns[i]->name,stkdep);
>+ 		if (stkdep>0) {
>+ 			SLdo_pop_n(stkdep);
>+-			SLang_Error = 0;  /* probably safe to keep going */
>++			SLang_set_error(0);  /* probably safe to keep going */
>+ 		}
>+ 	}
>+ 
>+@@ -1840,7 +1840,7 @@
>+ 			ct++;
>+ 			do_action_i(t,0);
>+ 			if (t->fd >= 0 && t->fns[0] && rbufp == t->rbufp && check_buf_data(t) >= 0) {
>+-				SLang_doerror("read-action did not handle data");
>++				SLang_verror(SL_INTRINSIC_ERROR,"read-action did not handle data");
>+ 				t->fns[0] = NULL; /* this to radically kill it */
>+ 			}
>+ 		}while (!vfile_list_dirty && t != tn);
>+@@ -1868,7 +1868,7 @@
>+ 	static fd_set fds[3];  /* a big one, we could malloc */
>+ 
>+ 	if (do_actions_dep++) { /* we are NOT recursive! */
>+-		SLang_doerror("Can't call do_actions() recursively");
>++		SLang_verror(SL_INTRINSIC_ERROR,"Can't call do_actions() recursively");
>+ 		goto return_ct;
>+ 	}
>+ 	/*tim = (int)time(NULL); */
>+@@ -2133,8 +2133,8 @@
>+ {
>+ 	SLang_Class_Type *cl;
>+ 
>+-	if (SLclass_add_typecast(SLANG_CHAR_TYPE, SLANG_INT_TYPE, char_to_int, 1)
>+-	 || SLclass_add_typecast(SLANG_INT_TYPE, SLANG_CHAR_TYPE, int_to_char, 1))
>++        if (SLclass_add_typecast(SLANG_CHAR_TYPE, SLANG_INT_TYPE, char_to_int, 1)
>++         || SLclass_add_typecast(SLANG_INT_TYPE, SLANG_CHAR_TYPE, int_to_char, 1))
>+ 	{
>+ 		fprintf(stderr,"VFile: fail add_typecast(CHAR<->INT)\n");
>+ 		return -1;
>+@@ -2151,8 +2151,9 @@
>+ 
>+ 	if (NULL == (cl = SLclass_allocate_class("VFile_Type")))
>+ 		return -1;
>+-	cl->cl_destroy = destroy_vfile_type;
>+-	cl->cl_string = vfile_string;
>++	SLclass_set_destroy_function(cl, destroy_vfile_type);
>++	SLclass_set_string_function(cl, vfile_string);
>++
>+ 	if (-1 == SLclass_register_class(cl, SJ_VFILE_TYPE, sizeof(VFILE), SLANG_CLASS_TYPE_MMT)) 
>+ 		return -1;
>+ 
>Index: net/asterisk-app-notify/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/asterisk-app-notify/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- net/asterisk-app-notify/Makefile	6 Jun 2008 13:49:53 -0000	1.5
>+++ net/asterisk-app-notify/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	app_notify
> DISTVERSION=	2.0rc1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	http://www.mezzo.net/asterisk/ \
> 		http://static.oyam.ca/freebsd/ports/
>Index: graphics/libcaca/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/graphics/libcaca/Makefile,v
>retrieving revision 1.24
>diff -u -r1.24 Makefile
>--- graphics/libcaca/Makefile	19 Jun 2008 19:46:13 -0000	1.24
>+++ graphics/libcaca/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	libcaca
> DISTVERSION=	0.99.beta13
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> MASTER_SITES=	http://libcaca.zoy.org/files/
> 
>@@ -22,7 +22,7 @@
> 		--disable-csharp \
> 		--disable-ruby
> 
>-DOCS=		AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \
>+PORTSDOC=		AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \
> 		NOTES README THANKS TODO
> MAN1=		caca-config.1 cacafire.1 cacaplay.1 cacaserver.1 cacaview.1 \
> 		img2txt.1
>@@ -39,14 +39,8 @@
> USE_EFL+=	imlib2
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> .if defined(WITH_SLANG)
>-.  if exists(${LOCALBASE}/lib/libslang.so.1)
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
>-.  else
> LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
>-.  endif
> CONFIGURE_ARGS+=--enable-slang
> .else
> CONFIGURE_ARGS+=--disable-slang
>@@ -61,9 +55,9 @@
> .ifndef (NOPORTDOCS)
> post-install:
> 	@${MKDIR} ${DOCSDIR}
>-.for i in ${DOCS}
>+.for i in ${PORTDOCS}
> 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
> .endfor
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: graphics/libcaca/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/graphics/libcaca/pkg-plist,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-plist
>--- graphics/libcaca/pkg-plist	27 Feb 2008 22:51:18 -0000	1.4
>+++ graphics/libcaca/pkg-plist	22 Aug 2008 13:07:24 -0000
>@@ -28,16 +28,5 @@
> lib/libcucul.so.0
> libdata/pkgconfig/caca.pc
> libdata/pkgconfig/cucul.pc
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/NOTES
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/THANKS
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
> %%DATADIR%%/caca.txt
> @dirrm %%DATADIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: mail/mutt/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/mutt/Makefile,v
>retrieving revision 1.180
>diff -u -r1.180 Makefile
>--- mail/mutt/Makefile	6 Jun 2008 13:42:56 -0000	1.180
>+++ mail/mutt/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	mutt
> PORTVERSION=	1.4.2.3
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES+=	mail ipv6
> MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
> 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
>@@ -60,7 +60,7 @@
> .endif
> 
> .if defined(WITH_SLANG)
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
> .elif defined(WITH_NCURSES_PORT)
> LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
> .endif
>Index: mail/mutt-devel/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/mutt-devel/Makefile,v
>retrieving revision 1.294
>diff -u -r1.294 Makefile
>--- mail/mutt-devel/Makefile	20 Jun 2008 22:33:19 -0000	1.294
>+++ mail/mutt-devel/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -23,8 +23,7 @@
> # and SLANG (WITH_MUTT_SLANG). Note that you may have to set the variables
> # COLORTERM=yes and COLORFGBG="color1;color2" in your environment to get slang
> # function properly.
>-# The default version for slang is 1.x. Define WITH_MUTT_SLANG2 if you want
>-# to use the slang version 2.x
>+# The slang version is 2.x. 
> # The default version for ncurses is that which comes with the operating
> # system. If you want to use the ncurses supplied by the ports-system define
> # WITH_MUTT_NCURSES_PORT.
>@@ -113,7 +112,7 @@
> 
> PORTNAME=	mutt-devel
> PORTVERSION=	1.5.18
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES+=	mail ipv6
> .if defined(WITH_MUTT_NNTP)
> CATEGORIES+=	news
>@@ -261,10 +260,6 @@
> .if defined(WITH_MUTT_NCURSES_PORT)
> WITH_MUTT_NCURSES=	yes
> .endif
>-.if defined(WITH_MUTT_SLANG) || defined(WITH_SLANG)
>-MUTT_USES_SLANG=	yes
>-MUTT_USES_SLANG1=	yes
>-.endif
> .if defined(WITH_MUTT_SLANG2)
> MUTT_USES_SLANG=	yes
> MUTT_USES_SLANG2=	yes
>@@ -275,7 +270,7 @@
> .if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
> .if defined(SLANG_IS_DEFAULT)
> MUTT_USES_SLANG=	yes
>-MUTT_USES_SLANG1=	yes
>+MUTT_USES_SLANG2=	yes
> .elif defined(NCURSES_IS_DEFAULT)
> MUTT_USES_NCURSES=	yes
> .endif
>@@ -306,8 +301,6 @@
> .if defined(MUTT_USES_NCURSES_PORT)
> LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
> CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
>-.elif defined(MUTT_USES_SLANG1)
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
> .elif defined(MUTT_USES_SLANG2)
> LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
> .endif
>Index: misc/iselect/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/misc/iselect/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- misc/iselect/Makefile	22 Jul 2007 12:58:28 -0000	1.13
>+++ misc/iselect/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,11 +7,12 @@
> 
> PORTNAME=	iselect
> PORTVERSION=	1.4.0
>+PORTREVISION=	1
> CATEGORIES=	misc
> MASTER_SITES=	${MASTER_SITE_OSSP}
> MASTER_SITE_SUBDIR=	tool/iselect
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	Interactive Selection Tool
> 
> GNU_CONFIGURE=	yes
>@@ -20,7 +21,7 @@
> MAN1=		iselect.1
> 
> .if defined(WITH_SLANG)
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
> CONFIGURE_ARGS+=	--with-incdir=${LOCALBASE}/include \
> 			--with-libdir=${LOCALBASE}/lib
> .endif
>Index: net/tn5250/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/tn5250/Makefile,v
>retrieving revision 1.28
>diff -u -r1.28 Makefile
>--- net/tn5250/Makefile	20 Mar 2008 09:56:44 -0000	1.28
>+++ net/tn5250/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -9,10 +9,9 @@
> PORTVERSION=	0.17.3
> PORTREVISION=	1
> CATEGORIES=	net
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	SF
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@FreeBSD.org
> COMMENT=	5250 Telnet protocol and Terminal
> 
> USE_AUTOTOOLS=	libtool:15
>@@ -31,8 +30,8 @@
> LDFLAGS=	-L${LOCALBASE}/lib
> 
> .if defined(WITH_SLANG)
>-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
>-PKGNAMESUFFIX=	-slang
>+LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
>+PKGNAMESUFFIX=	-slang2
> CONFIGURE_ARGS+=	--with-slang=yes
> LDFLAGS+=	-lcurses
> .else
>Index: net/tn5250/files/patch-src__slangterm.c
>===================================================================
>RCS file: net/tn5250/files/patch-src__slangterm.c
>diff -N net/tn5250/files/patch-src__slangterm.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ net/tn5250/files/patch-src__slangterm.c	22 Aug 2008 13:07:24 -0000
>@@ -0,0 +1,40 @@
>+--- ./src/slangterm.c.orig	2005-05-03 03:14:45.000000000 +0000
>++++ ./src/slangterm.c	2008-08-11 21:17:36.000000000 +0000
>+@@ -156,16 +156,16 @@
>+ {
>+    SLtt_get_terminfo ();
>+    if (-1 == SLkp_init ()) {
>+-      SLang_doerror ("SLkp_init failed.");
>++      SLang_verror (SL_INTRINSIC_ERROR, "SLkp_init failed.");
>+       exit (255);
>+    }
>+    if (-1 == SLang_init_tty (K_CTRL('Q'), 1, 0)) {
>+-      SLang_doerror ("SLang_init_tty failed.");
>++      SLang_verror (SL_INTRINSIC_ERROR, "SLang_init_tty failed.");
>+       exit (255);
>+    }
>+    SLang_set_abort_signal (NULL);
>+    if (-1 == SLsmg_init_smg ()) {
>+-      SLang_doerror ("SLsmg_init_smg failed.");
>++      SLang_verror (SL_INTRINSIC_ERROR, "SLsmg_init_smg failed.");
>+       exit (255);
>+    }
>+ 
>+@@ -400,7 +400,7 @@
>+    int result = 0;
>+    int sm;
>+ 
>+-   if (SLang_Error == USER_BREAK)
>++   if (USER_BREAK == SLang_get_error())
>+       This->data->quit_flag = 1;
>+    if (This->data->quit_flag)
>+       return TN5250_TERMINAL_EVENT_QUIT;
>+@@ -499,7 +499,7 @@
>+ 	 break;
>+ 
>+       case SL_KEY_ERR:
>+-	 if (SLang_Error == USER_BREAK)
>++	 if (USER_BREAK == SLang_get_error())
>+ 	    This->data->quit_flag = 1;
>+ 	 return -1;
>+ 
>Index: net/trafshow3/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/trafshow3/Makefile,v
>retrieving revision 1.37
>diff -u -r1.37 Makefile
>--- net/trafshow3/Makefile	16 Apr 2007 18:40:59 -0000	1.37
>+++ net/trafshow3/Makefile	22 Aug 2008 13:07:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	trafshow
> PORTVERSION=	3.1
>-PORTREVISION=	6
>+PORTREVISION=	7
> PORTEPOCH=	1
> CATEGORIES=	net
> MASTER_SITES=	ftp://ftp.sasknow.com/pub/trafshow/ \
>@@ -23,7 +23,7 @@
> 
> .if defined(WITH_TRAFSHOW_SLANG) || \
>     (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG))
>-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
>+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
> .endif
> 
> GNU_CONFIGURE=	yes

Actions: View | Diff

Attachments on bug 125255: 88454 | 88455 | 88456