aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--devel/Makefile1
-rw-r--r--devel/libslang/Makefile2
-rw-r--r--devel/libslang2-devel/Makefile61
-rw-r--r--devel/libslang2-devel/distinfo3
-rw-r--r--devel/libslang2-devel/pkg-descr14
-rw-r--r--devel/libslang2-devel/pkg-plist80
-rw-r--r--devel/libslang2/Makefile2
-rw-r--r--japanese/libslang/Makefile2
9 files changed, 4 insertions, 162 deletions
diff --git a/MOVED b/MOVED
index 38f55630f591..74d42fc85064 100644
--- a/MOVED
+++ b/MOVED
@@ -3099,3 +3099,4 @@ net/gnet-glib2|net/gnet2|2007-07-09|Functionality merged into gnet2
www/lynx-ssl|www/lynx|2007-07-10|SSL enabled by default in www/lynx
net-p2p/py-bittorrent-devel|net-p2p/py-bittorent|2007-07-10|Non-devel port have newer version
net-p2p/py-bittorrent-core-devel|net-p2p/py-bittorent-core|2007-07-10|Non-devel port have newer version
+devel/libslang2-devel||2007-07-11|Non-devel port have newer version
diff --git a/devel/Makefile b/devel/Makefile
index 42e54355389b..79dbc265c416 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -619,7 +619,6 @@
SUBDIR += libsigsegv
SUBDIR += libslang
SUBDIR += libslang2
- SUBDIR += libslang2-devel
SUBDIR += libsoup
SUBDIR += libsoup-reference
SUBDIR += libstatgrab
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index e427d7e1c17f..0ea436f01452 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFLICTS= libslang2-[0-9]* libslang2-devel-[0-9]* libslang-1.*.j[0-9]
+CONFLICTS= libslang2-[0-9]* libslang-1.*.j[0-9]
ALL_TARGET= all elf
INSTALL_TARGET= install install-elf
diff --git a/devel/libslang2-devel/Makefile b/devel/libslang2-devel/Makefile
deleted file mode 100644
index fa2013d93f42..000000000000
--- a/devel/libslang2-devel/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for: libslang2-devel
-# Date created: 2007-02-24
-# Whom: garga
-#
-# $FreeBSD$
-#
-
-PORTNAME= libslang2
-PORTVERSION= 20070224
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/slang
-PKGNAMESUFFIX= -devel
-DISTNAME= slang2${PKGNAMESUFFIX}-${PORTVERSION}
-
-MAINTAINER= garga@FreeBSD.org
-COMMENT= Routines for rapid alpha-numeric terminal applications development
-
-USE_BZIP2= yes
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-CONFLICTS= libslang-1.*
-
-ALL_TARGET= all elf
-INSTALL_TARGET= install install-elf
-
-MAN1= slsh.1
-DOCSDIR= ${PREFIX}/share/doc/slang
-DATADIR= ${PREFIX}/share/slsh
-
-OPTIONS= PCRE "Include pcre support" on \
- PNG "Include png support" on
-
-PORTDOCS= *
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_PCRE)
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-PLIST_SUB+= PCRE=""
-.else
-CONFIGURE_ARGS+= --without-pcre
-PLIST_SUB+= PCRE="@comment "
-.endif
-
-.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
-PLIST_SUB+= PNG=""
-.else
-CONFIGURE_ARGS+= --without-png
-PLIST_SUB+= PNG="@comment "
-.endif
-
-post-patch:
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's, install_docs,,g' ${WRKSRC}/src/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/libslang2-devel/distinfo b/devel/libslang2-devel/distinfo
deleted file mode 100644
index 25520b5e66c9..000000000000
--- a/devel/libslang2-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (slang2-devel-20070224.tar.bz2) = 33577633aa174f1618437120c96854a7
-SHA256 (slang2-devel-20070224.tar.bz2) = 06c97e23697e567b83a69c5b33f6631178a618ffb5d88510228e509bf5663601
-SIZE (slang2-devel-20070224.tar.bz2) = 1132419
diff --git a/devel/libslang2-devel/pkg-descr b/devel/libslang2-devel/pkg-descr
deleted file mode 100644
index 78a7bdc5c819..000000000000
--- a/devel/libslang2-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-S-Lang is a multi-platform programmer's library designed to
-allow a developer to create robust multi-platform software.
-
-It provides facilities required by interactive applications
-such as display/screen management, keyboard input, keymaps,
-and so on.
-
-The most exciting feature of the library is the slang
-interpreter that may be easily embedded into a program to
-make it extensible.
-
-This is development version.
-
-WWW: http://www.jedsoft.org/slang/
diff --git a/devel/libslang2-devel/pkg-plist b/devel/libslang2-devel/pkg-plist
deleted file mode 100644
index d41cf5ac800f..000000000000
--- a/devel/libslang2-devel/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-@comment $FreeBSD$
-bin/slsh
-etc/slsh.rc
-include/slang.h
-include/slcurses.h
-lib/libslang.a
-lib/libslang.so.2
-lib/libslang.so
-lib/slang/v2/modules/fcntl-module.so
-%%PCRE%%lib/slang/v2/modules/pcre-module.so
-%%PNG%%lib/slang/v2/modules/png-module.so
-lib/slang/v2/modules/select-module.so
-lib/slang/v2/modules/slsmg-module.so
-lib/slang/v2/modules/socket-module.so
-lib/slang/v2/modules/termios-module.so
-lib/slang/v2/modules/varray-module.so
-%%DATADIR%%/arrayfuns.sl
-%%DATADIR%%/autoload.sl
-%%DATADIR%%/cmaps/cool.map
-%%DATADIR%%/cmaps/copper.map
-%%DATADIR%%/cmaps/drywet.map
-%%DATADIR%%/cmaps/gebco.map
-%%DATADIR%%/cmaps/globe.map
-%%DATADIR%%/cmaps/gray.map
-%%DATADIR%%/cmaps/haxby.map
-%%DATADIR%%/cmaps/hot.map
-%%DATADIR%%/cmaps/jet.map
-%%DATADIR%%/cmaps/no_green.map
-%%DATADIR%%/cmaps/ocean.map
-%%DATADIR%%/cmaps/polar.map
-%%DATADIR%%/cmaps/rainbow.map
-%%DATADIR%%/cmaps/red2green.map
-%%DATADIR%%/cmaps/relief.map
-%%DATADIR%%/cmaps/sealand.map
-%%DATADIR%%/cmaps/seis.map
-%%DATADIR%%/cmaps/split.map
-%%DATADIR%%/cmaps/topo.map
-%%DATADIR%%/cmaps/wysiwyg.map
-%%DATADIR%%/fcntl.sl
-%%DATADIR%%/glob.sl
-%%DATADIR%%/help/arrayfuns.hlp
-%%DATADIR%%/help/glob.hlp
-%%DATADIR%%/help/pcrefuns.hlp
-%%DATADIR%%/help/pngfuns.hlp
-%%DATADIR%%/help/require.hlp
-%%DATADIR%%/help/sockfuns.hlp
-%%DATADIR%%/help/structfuns.hlp
-%%DATADIR%%/pcre.sl
-%%DATADIR%%/png.sl
-%%DATADIR%%/print.sl
-%%DATADIR%%/profile.sl
-%%DATADIR%%/require.sl
-%%DATADIR%%/rline/complete.sl
-%%DATADIR%%/rline/slrline.rc
-%%DATADIR%%/scripts/jpegsize
-%%DATADIR%%/scripts/lsrpm
-%%DATADIR%%/scripts/sldb
-%%DATADIR%%/scripts/slprof
-%%DATADIR%%/scripts/svnsh
-%%DATADIR%%/select.sl
-%%DATADIR%%/sldb.sl
-%%DATADIR%%/sldbcore.sl
-%%DATADIR%%/sldbsock.sl
-%%DATADIR%%/slshrl.sl
-%%DATADIR%%/slsmg.sl
-%%DATADIR%%/slshhelp.sl
-%%DATADIR%%/socket.sl
-%%DATADIR%%/stkcheck.sl
-%%DATADIR%%/structfuns.sl
-%%DATADIR%%/termios.sl
-%%DATADIR%%/varray.sl
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/rline
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/cmaps
-@dirrmtry %%DATADIR%%/local-packages
-@dirrm %%DATADIR%%
-@dirrm lib/slang/v2/modules
-@dirrm lib/slang/v2
-@dirrm lib/slang
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 3b4c7fd73c77..45f02dfe98fa 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFLICTS= libslang-[0-9]* libslang2-devel-[0-9]*
+CONFLICTS= libslang-[0-9]* libslang-1.*.j[0-9]
ALL_TARGET= all static
INSTALL_TARGET= install install-static
diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index aff82f593d97..8c11488bad6c 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -16,7 +16,7 @@ DISTNAME= slang-${VERSION}jp${JP_VERSION}
MAINTAINER= iwashita@cqmail.net
COMMENT= A library permits a programmer to develop software
-CONFLICTS= libslang2-[0-9]* libslang2-devel-[0-9]* libslang-1.*[^j]*
+CONFLICTS= libslang2-[0-9]* libslang-1.*[^j]*
VERSION= 1.4.5
JP_VERSION= 2