4 files changed, 21 insertions, 51 deletions

diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index b413548d7740..cae6484aaf1b 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -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 <bsd.port.pre.mk>
 
@@ -40,7 +41,16 @@ CONFIGURE_ARGS+=	--enable-slang
 .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 <bsd.port.post.mk>
diff --git a/graphics/libcaca/files/patch-Makefile.in b/graphics/libcaca/files/patch-Makefile.in
deleted file mode 100644
index 113a76254f40..000000000000
--- a/graphics/libcaca/files/patch-Makefile.in
+++ /dev/null
@@ -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 --git a/graphics/libcaca/files/patch-configure b/graphics/libcaca/files/patch-configure
deleted file mode 100644
index 8bcbd2555304..000000000000
--- a/graphics/libcaca/files/patch-configure
+++ /dev/null
@@ -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 --git a/graphics/libcaca/files/patch-examples::Makefile.in b/graphics/libcaca/files/patch-examples::Makefile.in
deleted file mode 100644
index 3a2a446144df..000000000000
--- a/graphics/libcaca/files/patch-examples::Makefile.in
+++ /dev/null
@@ -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@