aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES8
-rw-r--r--MOVED1
-rw-r--r--UPDATING12
-rw-r--r--audio/timidity++-slang/Makefile4
-rw-r--r--comms/hf/Makefile4
-rw-r--r--devel/Makefile1
-rw-r--r--devel/gaul/Makefile12
-rw-r--r--devel/gaul/pkg-plist1
-rw-r--r--devel/libslang/Makefile61
-rw-r--r--devel/libslang/distinfo6
-rw-r--r--devel/libslang/files/patch-configure36
-rw-r--r--devel/libslang/files/patch-src_Makefile.in50
-rw-r--r--devel/libslang/pkg-descr19
-rw-r--r--devel/libslang/pkg-plist9
-rw-r--r--devel/libslang2/Makefile4
-rw-r--r--devel/newt/Makefile4
-rw-r--r--devel/ruby-slang/Makefile8
-rw-r--r--editors/jed/Makefile11
-rw-r--r--editors/lpe/Makefile6
-rw-r--r--games/netspades/Makefile6
-rw-r--r--irc/slirc/Makefile6
-rw-r--r--irc/slirc/files/patch-slirc.c93
-rw-r--r--irc/slirc/files/patch-vfile-module.c183
-rw-r--r--japanese/asterisk-sound/Makefile2
-rw-r--r--japanese/asterisk-sounds/Makefile2
-rw-r--r--japanese/asterisk14-sounds/Makefile2
-rw-r--r--japanese/jed/Makefile2
-rw-r--r--japanese/ruby-slang/Makefile2
-rw-r--r--japanese/slirc/Makefile2
-rw-r--r--japanese/timidity++-slang/Makefile2
-rw-r--r--lang/harbour/Makefile6
-rw-r--r--math/slsc/Makefile7
-rw-r--r--misc/pdmenu/Makefile15
-rw-r--r--misc/zaptel/Makefile1
-rw-r--r--net/asterisk-addons/Makefile2
-rw-r--r--net/asterisk-app-notify/Makefile2
-rw-r--r--net/asterisk12-addons/Makefile2
-rw-r--r--net/asterisk12/Makefile1
-rw-r--r--net/asterisk14-addons/Makefile2
-rw-r--r--net/asterisk16-addons/Makefile2
-rw-r--r--net/astfax/Makefile4
-rw-r--r--net/astmanproxy/Makefile2
-rw-r--r--sysutils/slmon/Makefile9
-rw-r--r--www/asterisk-gui/Makefile2
-rw-r--r--www/asterisk-stat/Makefile2
45 files changed, 357 insertions, 261 deletions
diff --git a/CHANGES b/CHANGES
index 3f576b5f117a..b30aa28e177e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,14 @@ in the release notes.
All ports committers are allowed to commit to this file.
+20090207:
+AUTHOR: pgollucci@FreeBSD.org
+
+ * devel/libslang dropped in favor of devel/libslang2
+
+ * WITH_SLANG2 has been removed. WITH_SLANG now implies
+ devel/libslang2.
+
20080905:
AUTHOR: hrs@FreeBSD.org
diff --git a/MOVED b/MOVED
index beec2bd79085..6deff9e3d53f 100644
--- a/MOVED
+++ b/MOVED
@@ -3807,3 +3807,4 @@ devel/py-coro||2009-02-03|Has expired: has been broken for more than 6 months
chinese/stardict2-dict-zh_TW||2009-02-03|Has expired: has been broken for more than 6 months
x11-themes/gtk-industrial-theme||2009-02-03|Has expired: has been broken for more than 6 months
sysutils/srmt||2009-02-07|Moved into archivers/star
+devel/libslang|devel/libslang2|2009-02-07|Abandoned upstream, replaced by devel/libslang2
diff --git a/UPDATING b/UPDATING
index 408d18be9a53..e933aa72966f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20090207:
+ AFFECTS: users of devel/libslang and devel/libslang2
+ AUTHOR: pgollucci@FreeBSD.org
+
+ devel/libslang has been removed in favor of devel/libslang2
+ after not being released in the last 5yrs. WITH_SLANG2 is
+ nolonger a valid ports KNOB. All ports depending on devel/libslang
+ should be recompiled.
+
+ # portupgrade -o devel/libslang devel/libslang2
+ # portupgrade -rf libxcb
+
20090130:
AFFECTS: users of www/httptunnel
AUTHOR: rafan@FreeBSD.org
diff --git a/audio/timidity++-slang/Makefile b/audio/timidity++-slang/Makefile
index 8e9aa0242b42..9e1440888c4c 100644
--- a/audio/timidity++-slang/Makefile
+++ b/audio/timidity++-slang/Makefile
@@ -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
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index ae5256f05aa4..0a01f7833b48 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -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
diff --git a/devel/Makefile b/devel/Makefile
index 15d3e05ceb57..95248f836337 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -714,7 +714,6 @@
SUBDIR += libsigc++20
SUBDIR += libsigcx
SUBDIR += libsigsegv
- SUBDIR += libslang
SUBDIR += libslang2
SUBDIR += libsoup
SUBDIR += libsoup-reference
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 0ac4a83d7562..c6d52cb9aba2 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -10,16 +10,15 @@ PORTNAME= gaul
PORTVERSION= 0.1849.0
PORTREVISION= 1
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
@@ -30,4 +29,7 @@ USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure
+run-autotools::
+ (cd ${WRKSRC} ; ${ACLOCAL} ; ${AUTOMAKE})
+
.include <bsd.port.mk>
diff --git a/devel/gaul/pkg-plist b/devel/gaul/pkg-plist
index c0d1eeb5ada0..f0153244f1bd 100644
--- a/devel/gaul/pkg-plist
+++ b/devel/gaul/pkg-plist
@@ -1,4 +1,3 @@
-bin/gaul_diagnostics
include/gaul/avltree.h
include/gaul/compatibility.h
include/gaul/ga_bitstring.h
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
deleted file mode 100644
index 3f232f75aab5..000000000000
--- a/devel/libslang/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for: S-Lang library
-# Date created: 11 July 1996
-# Whom: ache
-#
-# $FreeBSD$
-#
-
-PORTNAME= libslang
-PORTVERSION= 1.4.9
-CATEGORIES= devel
-MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
- ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v1.4/ \
- ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/
-DISTFILES= slang-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER= garga@FreeBSD.org
-COMMENT= Routines for rapid alpha-numeric terminal applications development
-
-OPTIONS= UTF8 "Enable UTF-8 support" off
-
-WRKSRC= ${WRKDIR}/slang-${PORTVERSION}
-
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-CONFLICTS= libslang2-[0-9]* libslang-1.*.j[0-9]
-
-ALL_TARGET= all elf
-INSTALL_TARGET= install install-elf
-
-DOCSDIR= ${PREFIX}/share/doc/slang
-PORTDOCS= *
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_UTF8)
-MASTER_SITES+= ${MASTER_SITE_GENTOO:S/$/:utf8/}
-MASTER_SITE_SUBDIR+= distfiles/:utf8
-DISTFILES+= slang-${PORTVERSION}-patches.tar.gz:utf8
-PLIST_SUB= UTF8=""
-
-post-patch:
- @for p in ${WRKDIR}/slang*utf8*.patch; do \
- ${PATCH} --silent -d ${WRKSRC} -p1 < $$p; \
- done
-.else
-PLIST_SUB= UTF8="@comment "
-.endif
-
-post-install:
-.if defined(WITH_UTF8)
-. for ext in a so so.1
- ${LN} -sf ${PREFIX}/lib/libslang-utf8.${ext} ${PREFIX}/lib/libslang.${ext}
-. endfor
-.endif
-
-.if !defined(NOPORTDOCS)
- @cd ${WRKSRC}/src && ${MAKE} install_docs
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo
deleted file mode 100644
index 4c3d5ade4298..000000000000
--- a/devel/libslang/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (slang-1.4.9.tar.gz) = c73aa62b2d1b215ca55a7337daa3f543
-SHA256 (slang-1.4.9.tar.gz) = 3969dbafdeac98d078855d29f47a8dab941f1789274cd0981a8b400c397855f8
-SIZE (slang-1.4.9.tar.gz) = 805990
-MD5 (slang-1.4.9-patches.tar.gz) = a69e4f7558e727decb3efa8d9a9e77b6
-SHA256 (slang-1.4.9-patches.tar.gz) = 487174a2b5df8564b99589e789319b37ee75c52d09ce98bfb12656414cdca3fb
-SIZE (slang-1.4.9-patches.tar.gz) = 12132
diff --git a/devel/libslang/files/patch-configure b/devel/libslang/files/patch-configure
deleted file mode 100644
index eec2e732377e..000000000000
--- a/devel/libslang/files/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.orig Sun Jan 26 07:31:27 2003
-+++ configure Fri Feb 21 17:21:25 2003
-@@ -2034,6 +2034,14 @@
- ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib"
- ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib"
- ;;
-+ *freebsd* )
-+ ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
-+ ELF_CC="\$(CC)"
-+ ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+ ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
-+ ELF_LINK_CMD="\$(ELF_LINK)"
-+ ELF_DEP_LIBS="\$(DL_LIB) -lm"
-+ ;;
- * )
- echo "Note: ELF compiler for host_os=$host_os may be wrong"
- ELF_CC="$CC"
-@@ -2439,16 +2451,8 @@
-
- echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
- echo "configure:2442: checking SLANG_VERSION" >&5
--slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h |
-- awk '{ print $3 }'`
--slang_major_version=`echo $slang_version |
-- awk '{ print int($1/10000) }'`
--slang_minor_version=`echo $slang_version $slang_major_version |
-- awk '{ print int(($1 - $2*10000)/100) }'`
--slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
-- awk '{ print ($1 - $2*10000 - $3*100) }'`
--
--slang_minor_version="$slang_minor_version.$slang_mminor_version"
-+slang_major_version=1
-+slang_minor_version=6
- slang_version="$slang_major_version.$slang_minor_version"
- echo "$ac_t""$slang_version" 1>&6
-
diff --git a/devel/libslang/files/patch-src_Makefile.in b/devel/libslang/files/patch-src_Makefile.in
deleted file mode 100644
index 8fdbb7ec33f1..000000000000
--- a/devel/libslang/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/Makefile.in.orig Sun Jan 26 07:31:27 2003
-+++ src/Makefile.in Fri Feb 21 18:21:31 2003
-@@ -38,7 +38,7 @@
- exec_prefix = @exec_prefix@
- install_lib_dir = @libdir@
- install_include_dir = @includedir@
--install_doc_dir = $(prefix)/doc/slang
-+install_doc_dir = $(prefix)/share/doc/slang
- DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
- MODULE_INSTALL_DIR = @libdir@/slang/modules
- #---------------------------------------------------------------------------
-@@ -140,7 +140,7 @@
- #---------------------------------------------------------------------------
- # Intallation rules
- #---------------------------------------------------------------------------
--install: install_basic_lib install_docs
-+install: install_basic_lib
- install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)
- @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)
- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
-@@ -162,24 +162,19 @@
- $(MKINSDIR) $(DEST_LIBDIR)
- install-elf: elf install
- -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-- -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
-- @echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR)
-+ @echo installing $(ELFLIB_MAJOR) in $(DEST_LIBDIR)
- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
-- @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
-- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
-- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
-+ @echo creating symbolic links to $(ELFLIB_MAJOR)
-+ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
- @echo ""
-- @echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR).
-- @echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) were also created.
-+ @echo $(ELFLIB_MAJOR) created in $(DEST_LIBDIR).
-+ @echo The links $(ELFLIB) to $(ELFLIB_MAJOR) were also created.
- @echo ""
- install-links:
- -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-- -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
-- cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
- cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
- @echo
- @echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) was created.
-- @echo A link $(ELFLIB) to $(ELFLIB_MAJOR) was created.
- @echo ""
- #---------------------------------------------------------------------------
- # Tests
diff --git a/devel/libslang/pkg-descr b/devel/libslang/pkg-descr
deleted file mode 100644
index cfc28d82132f..000000000000
--- a/devel/libslang/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-S-Lang is a C programmer's library that includes routines for the rapid
-development of sophisticated, user friendly, multi-platform applications.
-The S-Lang library includes the following:
-
- - Low level tty input routines for reading single characters at a time.
- - Keymap routines for defining keys and manipulating multiple keymaps.
- - High level screen management routines for manipulating both
- monochrome and color terminals. These routines are very
- efficient.
- - Low level terminal-independent routines for manipulating the display
- of a terminal.
- - Routines for reading single line input with line editing and recall
- capabilities.
- - Searching functions: both ordinary searches and regular expression
- searches.
- - An embedded stack-based language interpreter with a C-like syntax.
- - A malloc debugging package
-
-WWW: http://www.s-lang.org/
diff --git a/devel/libslang/pkg-plist b/devel/libslang/pkg-plist
deleted file mode 100644
index 4e89b8a99bc4..000000000000
--- a/devel/libslang/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD$
-include/slang.h
-include/slcurses.h
-lib/libslang.a
-lib/libslang.so
-lib/libslang.so.1
-%%UTF8%%lib/libslang-utf8.a
-%%UTF8%%lib/libslang-utf8.so
-%%UTF8%%lib/libslang-utf8.so.1
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index d7df2ac6bdda..f87b863799aa 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -16,13 +16,13 @@ DISTNAME= slang-${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Routines for rapid alpha-numeric terminal applications development
+CONFLICTS= libslang-1.*.j[0-9]
+
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
PLIST_SUB+= SHLIB_VERSION=${PORTVERSION}
-CONFLICTS= libslang-[0-9]* libslang-1.*.j[0-9]
-
ALL_TARGET= all static
INSTALL_TARGET= install install-static
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 19db147f75e8..9172322d60ba 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -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 @@ PKGNAMESUFFIX= ${PYTHONSUFFIX}${TCLSUFFIX}
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
diff --git a/devel/ruby-slang/Makefile b/devel/ruby-slang/Makefile
index c324737366d2..4d75be3058c4 100644
--- a/devel/ruby-slang/Makefile
+++ b/devel/ruby-slang/Makefile
@@ -13,14 +13,10 @@ MASTER_SITE_SUBDIR= fenner/ruby-contrib
DISTNAME= ${PORTNAME}lib-${PORTVERSION:}-1m
DIST_SUBDIR= ruby
-MAINTAINER?= ports@FreeBSD.org
-COMMENT?= S-Lang extension module for Ruby
+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
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 5e1d8f785bf4..5225b96c56f6 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -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 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
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
@@ -43,11 +44,7 @@ MAN1= jed.1 rgrep.1
.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 "
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index bf5afd14907d..24b025afd516 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -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
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index cdb6f0981c28..fc3b1e7e4de6 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -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= ports@FreeBSD.org
+MAINTAINER= pgollucci@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
diff --git a/irc/slirc/Makefile b/irc/slirc/Makefile
index 2a81c8fb4367..84ef82c18769 100644
--- a/irc/slirc/Makefile
+++ b/irc/slirc/Makefile
@@ -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 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
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}" \
diff --git a/irc/slirc/files/patch-slirc.c b/irc/slirc/files/patch-slirc.c
index 6534fe35650a..c76a11c95c72 100644
--- a/irc/slirc/files/patch-slirc.c
+++ b/irc/slirc/files/patch-slirc.c
@@ -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 11:15:11.000000000 -0400
++++ ./slirc.c 2009-01-18 22:11:53.000000000 -0500
+@@ -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);
diff --git a/irc/slirc/files/patch-vfile-module.c b/irc/slirc/files/patch-vfile-module.c
index d3e3041e6375..ec942ed2be66 100644
--- a/irc/slirc/files/patch-vfile-module.c
+++ b/irc/slirc/files/patch-vfile-module.c
@@ -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;
+
diff --git a/japanese/asterisk-sound/Makefile b/japanese/asterisk-sound/Makefile
index 6cbd51a33de4..5d95975b41c4 100644
--- a/japanese/asterisk-sound/Makefile
+++ b/japanese/asterisk-sound/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-sounds
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.voip-info.jp/asterisk/sounds/
DISTNAME= ${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta
diff --git a/japanese/asterisk-sounds/Makefile b/japanese/asterisk-sounds/Makefile
index 6cbd51a33de4..5d95975b41c4 100644
--- a/japanese/asterisk-sounds/Makefile
+++ b/japanese/asterisk-sounds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-sounds
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.voip-info.jp/asterisk/sounds/
DISTNAME= ${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta
diff --git a/japanese/asterisk14-sounds/Makefile b/japanese/asterisk14-sounds/Makefile
index 6cbd51a33de4..5d95975b41c4 100644
--- a/japanese/asterisk14-sounds/Makefile
+++ b/japanese/asterisk14-sounds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-sounds
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.voip-info.jp/asterisk/sounds/
DISTNAME= ${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index 09c50ac9499d..cd8a5e477bc6 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-B${VERSION:R}-${VERSION:E}__J${JP_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-extralibs-${VERSION}.tar.gz
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= pgollucci@FreeBSD.org
COMMENT= A SLang-based text editor (w/ Japanese support)
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang
diff --git a/japanese/ruby-slang/Makefile b/japanese/ruby-slang/Makefile
index 66788886c2c1..1b8c186ed096 100644
--- a/japanese/ruby-slang/Makefile
+++ b/japanese/ruby-slang/Makefile
@@ -9,7 +9,7 @@ MASTERDIR= ${.CURDIR}/../../devel/ruby-slang
CATEGORIES= japanese
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= pgollucci@FreeBSD.org
COMMENT= S-Lang-jp extension module for Ruby
WITH_JAPANESE= yes
diff --git a/japanese/slirc/Makefile b/japanese/slirc/Makefile
index b4b52263e1f7..19ad2d130da2 100644
--- a/japanese/slirc/Makefile
+++ b/japanese/slirc/Makefile
@@ -15,6 +15,8 @@ MD5_FILE= ${.CURDIR}/distinfo
EXTRA_FILESDIR= ${.CURDIR}/files
EXTRA_PATCHES= ${EXTRA_FILESDIR}/patch-*
+BROKEN= Does not compile with devel/libslang2
+
SLANG_INCDIR= ${PREFIX}/include/slang
LIB_DEPENDS_LIBSLANG?= slang.2:${PORTSDIR}/japanese/libslang
diff --git a/japanese/timidity++-slang/Makefile b/japanese/timidity++-slang/Makefile
index 2c134f306796..83bfb2f82346 100644
--- a/japanese/timidity++-slang/Makefile
+++ b/japanese/timidity++-slang/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX= -slang
CATEGORIES= japanese
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= pgollucci@FreeBSD.org
COMMENT= Slang interface for TiMidity++ with Japanese support
MASTERDIR= ${.CURDIR}/../../audio/timidity++
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index 6a3dba910647..6c65df7b8947 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -7,14 +7,14 @@
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
+MAINTAINER= pgollucci@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
diff --git a/math/slsc/Makefile b/math/slsc/Makefile
index 973468bf3820..bcb363f84d9e 100644
--- a/math/slsc/Makefile
+++ b/math/slsc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= slsc
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://space.mit.edu/pub/davis/slsc/
DISTNAME= ${PORTNAME}
@@ -14,7 +15,11 @@ DISTNAME= ${PORTNAME}
MAINTAINER= noodles@earth.li
COMMENT= A enhanced slang-based version of the sc spreadsheet program
-LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
+LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
+
+BROKEN= Does not compile with devel/libslang2
+DEPRECATED= No longer maintained by author
+EXPIRATION_DATE= 2009-02-18
GNU_CONFIGURE= yes
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index da407b12965a..fa94a20c497d 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -6,14 +6,15 @@
PORTNAME= pdmenu
PORTVERSION= 1.2.96
+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,14 +36,6 @@ PLIST_FILES= bin/pdmenu \
%%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
${INSTALL_DATA} ${WRKSRC}/examples/pdmenurc ${PREFIX}/etc
@@ -59,4 +52,4 @@ do-install:
post-install:
@${STRIP_CMD} ${PREFIX}/bin/pdmenu
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/zaptel/Makefile b/misc/zaptel/Makefile
index 09b577b2802e..cfaf9a74049a 100644
--- a/misc/zaptel/Makefile
+++ b/misc/zaptel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zaptel
PORTVERSION= 1.4.11
+PORTREVISION= 1
CATEGORIES= misc kld
MASTER_SITES= http://people.freebsd.org/~gonzo/zaptel/
DISTNAME= ${PORTNAME}-bsd-${PORTVERSION}
diff --git a/net/asterisk-addons/Makefile b/net/asterisk-addons/Makefile
index 06bb8582f1dc..08c49e8587d0 100644
--- a/net/asterisk-addons/Makefile
+++ b/net/asterisk-addons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-addons
PORTVERSION= 1.4.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/releases/
diff --git a/net/asterisk-app-notify/Makefile b/net/asterisk-app-notify/Makefile
index e5f393aeab21..3b30fe46e9e0 100644
--- a/net/asterisk-app-notify/Makefile
+++ b/net/asterisk-app-notify/Makefile
@@ -7,7 +7,7 @@
PORTNAME= app_notify
DISTVERSION= 2.0rc1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.mezzo.net/asterisk/ \
http://static.oyam.ca/freebsd/ports/
diff --git a/net/asterisk12-addons/Makefile b/net/asterisk12-addons/Makefile
index b2b6ac6dadfd..ab4439bc2468 100644
--- a/net/asterisk12-addons/Makefile
+++ b/net/asterisk12-addons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-addons
PORTVERSION= 1.2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/ \
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 3342cbd52adc..495d6c1df8c7 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -9,6 +9,7 @@ PORTNAME= asterisk
PORTVERSION= 1.2.30.2
PORTREVISION= 1
PKGNAMESUFFIX= 12
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile
index 06bb8582f1dc..08c49e8587d0 100644
--- a/net/asterisk14-addons/Makefile
+++ b/net/asterisk14-addons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-addons
PORTVERSION= 1.4.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/releases/
diff --git a/net/asterisk16-addons/Makefile b/net/asterisk16-addons/Makefile
index 06bb8582f1dc..08c49e8587d0 100644
--- a/net/asterisk16-addons/Makefile
+++ b/net/asterisk16-addons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-addons
PORTVERSION= 1.4.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/releases/
diff --git a/net/astfax/Makefile b/net/astfax/Makefile
index 99a87f3efb3e..fb8019ee1df6 100644
--- a/net/astfax/Makefile
+++ b/net/astfax/Makefile
@@ -7,11 +7,11 @@
PORTNAME= astfax
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
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
diff --git a/net/astmanproxy/Makefile b/net/astmanproxy/Makefile
index ccce7b7e825a..f138d3003454 100644
--- a/net/astmanproxy/Makefile
+++ b/net/astmanproxy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= astmanproxy
PORTVERSION= 1.21
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= http://www.popvox.com/
DISTFILES= astmanproxy-latest.tgz
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 576dae9475ae..78009bf2f7b2 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -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
diff --git a/www/asterisk-gui/Makefile b/www/asterisk-gui/Makefile
index 34e42a280c3a..261721982f8e 100644
--- a/www/asterisk-gui/Makefile
+++ b/www/asterisk-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-gui
PORTVERSION= 2.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk-gui/releases/
diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile
index 53882807bd2a..ccec33631cbb 100644
--- a/www/asterisk-stat/Makefile
+++ b/www/asterisk-stat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-stat
PORTVERSION= 2.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= http://www.areski.net/${SITE_SUBDIR}/
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}