From a65952f61bb2844e99a49e4bbd84153f8b75a185 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 15 Oct 2009 23:27:09 +0000 Subject: [PATCH] - update libcaca to 0.99 beta16 (considered stable enough by upstream) - remove robert@ as maintainer per his request --- graphics/libcaca/Makefile | 34 ++++++++++++------ graphics/libcaca/distinfo | 10 +++--- graphics/libcaca/patches/patch-Makefile_in | 24 ++++++------- .../libcaca/patches/patch-caca_Makefile_in | 11 ++++++ graphics/libcaca/patches/patch-src_graphics_c | 12 ------- graphics/libcaca/pkg/PFRAG.shared | 2 ++ graphics/libcaca/pkg/PLIST | 36 ++++++++++--------- 7 files changed, 72 insertions(+), 57 deletions(-) create mode 100644 graphics/libcaca/patches/patch-caca_Makefile_in delete mode 100644 graphics/libcaca/patches/patch-src_graphics_c create mode 100644 graphics/libcaca/pkg/PFRAG.shared diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index 22d7899fc09..842e3a5f68a 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -1,21 +1,29 @@ -# $OpenBSD: Makefile,v 1.12 2009/08/10 06:31:45 kili Exp $ +# $OpenBSD: Makefile,v 1.13 2009/10/15 23:27:09 jasper Exp $ COMMENT= color ascii art library -DISTNAME= libcaca-0.9 -PKGNAME= ${DISTNAME}p4 + +DISTNAME= libcaca-0.99.beta16 +PKGNAME= libcaca-0.99.16 +SHARED_LIBS += caca 0.0 # .0.99 CATEGORIES= graphics -MAINTAINER= Robert Nagy - -# LGPL +# LGPLv2.1/Do What The Fuck You Want To Public License PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= c ncurses m z -HOMEPAGE= http://libcaca.zoy.org/ -MASTER_SITES= ${HOMEPAGE}raw-attachment/wiki/libcaca/ +HOMEPAGE= http://caca.zoy.org/ +MASTER_SITES= ${HOMEPAGE}/files/libcaca/ \ + http://www.phil.uu.nl/~lievisse/distfiles/ + +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= ::misc/zzuf +REGRESS_DEPENDS= ::devel/cppunit + +USE_LIBTOOL= Yes FLAVORS= no_x11 FLAVOR?= @@ -26,11 +34,15 @@ CONFIGURE_ARGS+= --disable-x11 \ .else LIB_DEPENDS= Imlib2.>=1::graphics/imlib2 USE_X11= Yes -WANTLIB+= X11 Xext freetype pthread-stubs xcb +WANTLIB+= X11 Xau Xdmcp Xext freetype pthread-stubs xcb .endif CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-doc --disable-slang -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools +CONFIGURE_ARGS+= --disable-doc \ + --disable-slang \ + --disable-ruby \ + --disable-python \ + --disable-csharp \ + --disable-cxx .include diff --git a/graphics/libcaca/distinfo b/graphics/libcaca/distinfo index 09280cd7082..a63c2b420f2 100644 --- a/graphics/libcaca/distinfo +++ b/graphics/libcaca/distinfo @@ -1,5 +1,5 @@ -MD5 (libcaca-0.9.tar.gz) = l7D1JvOUkTieFZBV9XTJIQ== -RMD160 (libcaca-0.9.tar.gz) = ZELqQIfTNImnHR4Mbj8oYIeTMAw= -SHA1 (libcaca-0.9.tar.gz) = be5Ni19fYGMz+21ukrHs/vlNwkE= -SHA256 (libcaca-0.9.tar.gz) = Xkid/feH2njBqHANdfKXYLokKK+CsMhMDMx5GFUFcco= -SIZE (libcaca-0.9.tar.gz) = 217200 +MD5 (libcaca-0.99.beta16.tar.gz) = OVO/SoA3R7Y6mfUBJVYxUQ== +RMD160 (libcaca-0.99.beta16.tar.gz) = /fyat+2yFE8beGIEhtiX1ywc+mY= +SHA1 (libcaca-0.99.beta16.tar.gz) = iUyKqGustAFU76qOS+l5TODD17k= +SHA256 (libcaca-0.99.beta16.tar.gz) = ykyTHL7UvE2MvJQtuRp/8P9eCk2uxm6y8nR3mRi2Ssw= +SIZE (libcaca-0.99.beta16.tar.gz) = 966593 diff --git a/graphics/libcaca/patches/patch-Makefile_in b/graphics/libcaca/patches/patch-Makefile_in index 717fea108cd..eb2a113ad00 100644 --- a/graphics/libcaca/patches/patch-Makefile_in +++ b/graphics/libcaca/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/04/18 02:03:38 jolan Exp $ ---- Makefile.in.orig Mon Jan 5 13:38:54 2004 -+++ Makefile.in Mon Jan 5 13:39:03 2004 -@@ -146,7 +146,7 @@ - bin_SCRIPTS = caca-config - - doc_DATA = README BUGS TODO AUTHORS NEWS NOTES THANKS --docdir = $(datadir)/doc/libcaca-dev -+docdir = $(datadir)/doc/libcaca - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs +$OpenBSD: patch-Makefile_in,v 1.2 2009/10/15 23:27:09 jasper Exp $ +--- Makefile.in.orig Fri Oct 16 00:40:07 2009 ++++ Makefile.in Fri Oct 16 00:40:20 2009 +@@ -236,7 +236,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = kernel caca src examples tests tools caca-sharp cxx python ruby doc ++SUBDIRS = kernel caca src examples tests tools cxx python ruby doc + DIST_SUBDIRS = $(SUBDIRS) win32 + EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec libcaca.sln + AUTOMAKE_OPTIONS = dist-bzip2 diff --git a/graphics/libcaca/patches/patch-caca_Makefile_in b/graphics/libcaca/patches/patch-caca_Makefile_in new file mode 100644 index 00000000000..7c041b0334f --- /dev/null +++ b/graphics/libcaca/patches/patch-caca_Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-caca_Makefile_in,v 1.1 2009/10/15 23:27:09 jasper Exp $ +--- caca/Makefile.in.orig Thu Oct 15 23:17:22 2009 ++++ caca/Makefile.in Fri Oct 16 00:33:30 2009 +@@ -1006,7 +1006,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLT + + install-exec-local: + $(mkinstalldirs) $(DESTDIR)$(libdir) +- . libcaca.la; \ + for x in $$library_names; do \ + ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \ + done diff --git a/graphics/libcaca/patches/patch-src_graphics_c b/graphics/libcaca/patches/patch-src_graphics_c deleted file mode 100644 index b6e5013d472..00000000000 --- a/graphics/libcaca/patches/patch-src_graphics_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_graphics_c,v 1.1.1.1 2004/04/18 02:03:38 jolan Exp $ ---- src/graphics.c.orig Sun Feb 1 05:26:48 2004 -+++ src/graphics.c Sun Feb 1 05:26:54 2004 -@@ -1305,7 +1305,7 @@ - { - _caca_width = size.ws_col; - _caca_height = size.ws_row; -- resize_term(_caca_height, _caca_width); -+ resizeterm(_caca_height, _caca_width); - wrefresh(curscr); - } - } diff --git a/graphics/libcaca/pkg/PFRAG.shared b/graphics/libcaca/pkg/PFRAG.shared new file mode 100644 index 00000000000..5734bdf1e7e --- /dev/null +++ b/graphics/libcaca/pkg/PFRAG.shared @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2009/10/15 23:27:09 jasper Exp $ +@lib lib/libcaca.so.${LIBcaca_VERSION} diff --git a/graphics/libcaca/pkg/PLIST b/graphics/libcaca/pkg/PLIST index 7b91f4f46b8..a7a17f68f1d 100644 --- a/graphics/libcaca/pkg/PLIST +++ b/graphics/libcaca/pkg/PLIST @@ -1,24 +1,26 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/08/03 14:43:38 robert Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/10/15 23:27:09 jasper Exp $ +%%SHARED%% bin/caca-config -bin/cacaball -bin/cacademo -bin/cacafire -bin/cacamoir -bin/cacaplas -bin/cacaview +@bin bin/cacademo +@bin bin/cacafire +@bin bin/cacaplay +@bin bin/cacaserver +@bin bin/cacaview +@bin bin/img2txt include/caca.h +include/caca0.h +include/caca_types.h +include/cucul.h lib/libcaca.a -lib/libcaca_pic.a +lib/libcaca.la +lib/pkgconfig/ +lib/pkgconfig/caca.pc +lib/pkgconfig/cucul.pc @man man/man1/caca-config.1 -@man man/man1/cacademo.1 +@man man/man1/cacafire.1 +@man man/man1/cacaplay.1 +@man man/man1/cacaserver.1 @man man/man1/cacaview.1 -share/doc/libcaca/ -share/doc/libcaca/AUTHORS -share/doc/libcaca/BUGS -share/doc/libcaca/NEWS -share/doc/libcaca/NOTES -share/doc/libcaca/README -share/doc/libcaca/THANKS -share/doc/libcaca/TODO +@man man/man1/img2txt.1 share/libcaca/ share/libcaca/caca.txt