-Update to 0.99.beta11.

-Update the WWW.

Be sure to read http://libcaca.zoy.org/manual/migrating.html If one of you
that want to migrate from old to new version.

PR:		ports/111495
Submitted by:	Dima Panov <fluffy@ael.ru> (with a bit tweak by mezz)

4 files changed, 48 insertions, 27 deletions

diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 1b44b22e332f..2c838076d744 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -3,52 +3,60 @@
 # Whom:				Vincent Tantardini <vinc@FreeBSD-fr.org>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	libcaca
-PORTVERSION=	0.9
-PORTREVISION=	6
+DISTVERSION=	0.99.beta11
 CATEGORIES=	graphics
 MASTER_SITES=	http://libcaca.zoy.org/files/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Graphics library that outputs text instead of pixels
 
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GNOME=	gnomehack gnometarget ltverhack pkgconfig
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lm -lncurses"
-CONFIGURE_ARGS=	--enable-ncurses --disable-doc
+CONFIGURE_ARGS=	--disable-doc \
+		--enable-ncurses \
+		--mandir=${PREFIX}/man
 
-MAN1=		caca-config.1 cacademo.1 cacaview.1
+DOCS=		AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \
+		NOTES README THANKS TODO
+MAN1=		caca-config.1 cacafire.1 cacaplay.1 cacaserver.1 cacaview.1 \
+		img2irc.1
 
 .if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--disable-x11
+CONFIGURE_ARGS+=--disable-x11
 .else
 USE_XLIB=	yes
 .endif
+
 .if defined(WITHOUT_IMLIB2)
-CONFIGURE_ARGS+=	--disable-imlib2
+CONFIGURE_ARGS+=--disable-imlib2
 .else
-LIB_DEPENDS+=		Imlib2.4:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_SLANG) || exists(${LOCALBASE}/lib/libslang.so)
-LIB_DEPENDS+=		slang.1:${PORTSDIR}/devel/libslang
-CONFIGURE_ARGS+=	--enable-slang
+.if defined(WITH_SLANG) || exists(${LOCALBASE}/lib/libslang.so.2)
+LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
+CONFIGURE_ARGS+=--enable-slang
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-g -O2 ,,g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,: install-docDATA,:,g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's,resize_term,resizeterm,g' ${WRKSRC}/src/graphics.c
+	@${REINPLACE_CMD} -e 's|-g -O2 ||g ; s| -fomit-frame-pointer||g ; \
+		s|arpa\/inet.h ||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' \
+		${WRKSRC}/Makefile.in
 
+.ifndef (NOPORTDOCS)
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in README BUGS TODO AUTHORS NEWS NOTES THANKS
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for i in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/graphics/libcaca/distinfo b/graphics/libcaca/distinfo
index bb1fa6e17eae..0c9ea7e84557 100644
--- a/graphics/libcaca/distinfo
+++ b/graphics/libcaca/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcaca-0.9.tar.gz) = 97b0f526f39491389e159055f574c921
-SHA256 (libcaca-0.9.tar.gz) = 5e489dfdf787da78c1a8700d75f29760ba2428af82b0c84c0ccc7918550571ca
-SIZE (libcaca-0.9.tar.gz) = 217200
+MD5 (libcaca-0.99.beta11.tar.gz) = 94f3ae45b9d7fed43a6511452e880937
+SHA256 (libcaca-0.99.beta11.tar.gz) = a751ffecd96416d9e13d9676bb2abbe9fad25d1c62dc11ef6013e1badccc40ce
+SIZE (libcaca-0.99.beta11.tar.gz) = 774028
diff --git a/graphics/libcaca/pkg-descr b/graphics/libcaca/pkg-descr
index a4aaf1837e04..24f2e06a2f1e 100644
--- a/graphics/libcaca/pkg-descr
+++ b/graphics/libcaca/pkg-descr
@@ -4,4 +4,4 @@ is not unlike the famous AAlib library. It also have 6 available colours
 for character output, dithering of colour images and basic sprite 
 primitives.
 
-WWW: http://sam.zoy.org/projects/libcaca/
+WWW: http://libcaca.zoy.org/
diff --git a/graphics/libcaca/pkg-plist b/graphics/libcaca/pkg-plist
index 6f77ddc5b189..1a3991c99446 100644
--- a/graphics/libcaca/pkg-plist
+++ b/graphics/libcaca/pkg-plist
@@ -1,15 +1,28 @@
 bin/caca-config
-bin/cacaball
 bin/cacademo
 bin/cacafire
-bin/cacamoir
-bin/cacaplas
+bin/cacaplay
+bin/cacaserver
 bin/cacaview
+bin/img2irc
 include/caca.h
+include/caca0.h
+include/cucul.h
 lib/libcaca.a
-lib/libcaca_pic.a
+lib/libcaca.la
+lib/libcaca.so
+lib/libcaca.so.0
+lib/libcucul.a
+lib/libcucul.la
+lib/libcucul.so
+lib/libcucul.so.0
+libdata/pkgconfig/caca.pc
+libdata/pkgconfig/cucul.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/NOTES
 %%PORTDOCS%%%%DOCSDIR%%/README