12 files changed, 13 insertions, 198 deletions

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