From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 15 16:10:27 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D86E316A4D5 for ; Thu, 15 Jul 2004 16:10:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEA9F43D39 for ; Thu, 15 Jul 2004 16:10:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6FGARfp073490 for ; Thu, 15 Jul 2004 16:10:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6FGARso073489; Thu, 15 Jul 2004 16:10:27 GMT (envelope-from gnats) Resent-Date: Thu, 15 Jul 2004 16:10:27 GMT Resent-Message-Id: <200407151610.i6FGARso073489@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAD9F16A4CE for ; Thu, 15 Jul 2004 16:01:28 +0000 (GMT) Received: from hfep06.dion.ne.jp (hfep06.dion.ne.jp [203.181.105.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70D3443D49 for ; Thu, 15 Jul 2004 16:01:27 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.124.240]) by hfep06.dion.ne.jp with SMTP id <20040715160123122.CAOM@hfep06.dion.ne.jp> for ; Fri, 16 Jul 2004 01:01:23 +0900 Message-Id: <20040716010019.166599ca.tkato432@yahoo.com> Date: Fri, 16 Jul 2004 01:00:19 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69112: Update port: graphics/libcaca X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2004 16:10:28 -0000 >Number: 69112 >Category: ports >Synopsis: Update port: graphics/libcaca >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 15 16:10:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.10-RELEASE-p2 i386 >Organization: >Environment: >Description: - Add WITHOUT_X11 knob - Support CFLAGS properly Remove file: files/patch-Makefile.in files/patch-configure files/patch-examples::Makefile.in >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/libcaca/Makefile graphics/libcaca/Makefile --- /usr/ports/graphics/libcaca/Makefile Tue Jul 6 14:04:49 2004 +++ graphics/libcaca/Makefile Thu Jul 15 23:55:34 2004 @@ -6,31 +6,32 @@ PORTNAME= libcaca PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://sam.zoy.org/projects/libcaca/ MAINTAINER= ports@FreeBSD.org COMMENT= Graphics library that outputs text instead of pixels -GNU_CONFIGURE= yes USE_REINPLACE= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+= --program-prefix="" \ - --enable-ncurses \ - --disable-doc + LDFLAGS="-L${LOCALBASE}/lib -lm -lncurses" +CONFIGURE_ARGS= --enable-ncurses --disable-doc MAN1= caca-config.1 cacademo.1 cacaview.1 -.if defined(NOPORTDOCS) -MAKE_ENV+= NOPORTDOCS=YES -.endif - +.if defined(WITHOUT_X11) +CONFIGURE_ARGS+= --disable-imlib2 --disable-x11 +.else +USE_XLIB= yes .if defined(WITHOUT_IMLIB2) CONFIGURE_ARGS+= --disable-imlib2 .else LIB_DEPENDS+= Imlib2.2:${PORTSDIR}/graphics/imlib2 .endif +.endif .include @@ -40,7 +41,16 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's,libcaca-dev,libcaca,g' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's,resize_term,resizeterm,g' ${WRKSRC}/src/graphics.c + @${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 + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in README BUGS TODO AUTHORS NEWS NOTES THANKS + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif .include Binary files /usr/ports/graphics/libcaca/cnslock-1.02.tar.gz and graphics/libcaca/cnslock-1.02.tar.gz differ diff -urN /usr/ports/graphics/libcaca/files/patch-Makefile.in graphics/libcaca/files/patch-Makefile.in --- /usr/ports/graphics/libcaca/files/patch-Makefile.in Mon Jan 12 08:55:54 2004 +++ graphics/libcaca/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,18 +0,0 @@ ---- Makefile.in.orig Wed Jan 7 19:23:13 2004 -+++ Makefile.in Sun Jan 11 23:51:28 2004 -@@ -229,6 +229,7 @@ - uninstall-info-am: - docDATA_INSTALL = $(INSTALL_DATA) - install-docDATA: $(doc_DATA) -+. if !defined (NOPORTDOCS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(docdir) - @list='$(doc_DATA)'; for p in $$list; do \ -@@ -237,6 +238,7 @@ - echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \ - $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \ - done -+. endif - - uninstall-docDATA: - @$(NORMAL_UNINSTALL) diff -urN /usr/ports/graphics/libcaca/files/patch-configure graphics/libcaca/files/patch-configure --- /usr/ports/graphics/libcaca/files/patch-configure Tue Jul 6 03:08:18 2004 +++ graphics/libcaca/files/patch-configure Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Mon Feb 2 04:00:34 2004 -+++ configure Sun Jul 4 21:16:49 2004 -@@ -4884,7 +4884,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lslang $LIBS" -+LIBS="-lslang -lncurses $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff -urN /usr/ports/graphics/libcaca/files/patch-examples::Makefile.in graphics/libcaca/files/patch-examples::Makefile.in --- /usr/ports/graphics/libcaca/files/patch-examples::Makefile.in Tue Jul 6 14:04:49 2004 +++ graphics/libcaca/files/patch-examples::Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- examples/Makefile.in.orig Mon Feb 2 04:00:44 2004 -+++ examples/Makefile.in Mon Mar 15 10:38:44 2004 -@@ -72,7 +72,7 @@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LATEX = @LATEX@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = -lm @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LTLIBOBJS = @LTLIBOBJS@ >Release-Note: >Audit-Trail: >Unformatted: