Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2013 00:32:08 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330813 - head/graphics/libcaca
Message-ID:  <201310190032.r9J0W8YD028760@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Oct 19 00:32:07 2013
New Revision: 330813
URL: http://svnweb.freebsd.org/changeset/ports/330813

Log:
  Enable stage
  Use options helpers
  Strip binaries

Modified:
  head/graphics/libcaca/Makefile
  head/graphics/libcaca/pkg-plist

Modified: head/graphics/libcaca/Makefile
==============================================================================
--- head/graphics/libcaca/Makefile	Sat Oct 19 00:27:47 2013	(r330812)
+++ head/graphics/libcaca/Makefile	Sat Oct 19 00:32:07 2013	(r330813)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcaca
 DISTVERSION=	0.99.beta18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://caca.zoy.org/raw-attachment/wiki/libcaca/
 
@@ -25,35 +25,17 @@ CONFIGURE_ARGS=	--disable-doc \
 
 DOCS=		AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \
 		NOTES README THANKS
-MAN1=		caca-config.1 cacademo.1 cacafire.1 cacaplay.1 cacaserver.1 \
-		cacaview.1 img2txt.1
 
 OPTIONS_DEFINE=	X11 IMLIB2 SLANG DOCS
 OPTIONS_DEFAULT=	X11 IMLIB2
 X11_DESC=	X11 and OpenGL support
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11
-USE_GL=		glut
-.else
-CONFIGURE_ARGS+=--disable-x11 --disable-gl
-.endif
-
-.if ${PORT_OPTIONS:MIMLIB2}
-USE_EFL+=	imlib2
-.else
-CONFIGURE_ARGS+=--disable-imlib2
-.endif
-
-.if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
-CONFIGURE_ARGS+=--enable-slang
-.else
-CONFIGURE_ARGS+=--disable-slang
-.endif
+X11_USE=	XORG=x11 GL=glut
+X11_CONFIGURE_OFF=	--disable-x11 --disable-gl
+IMLIB2_USE=	EFL=imlib2
+IMLIB2_CONFIGURE_ENABLE=	imlib2
+SLANG_LIB_DEPENDS=	libslang.so.2:${PORTSDIR}/devel/libslang2
+SLANG_CONFIGURE_ENABLE=	slang
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-g -O2 ||g ; s| -fomit-frame-pointer||g ; \
@@ -61,10 +43,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g ; s| csharp||g' \
 			${WRKSRC}/Makefile.in
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaca++.so.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaca.so.0
 
 .include <bsd.port.mk>

Modified: head/graphics/libcaca/pkg-plist
==============================================================================
--- head/graphics/libcaca/pkg-plist	Sat Oct 19 00:27:47 2013	(r330812)
+++ head/graphics/libcaca/pkg-plist	Sat Oct 19 00:32:07 2013	(r330813)
@@ -30,6 +30,13 @@ libdata/pkgconfig/caca++.pc
 libdata/pkgconfig/caca.pc
 libdata/pkgconfig/cucul++.pc
 libdata/pkgconfig/cucul.pc
+man/man1/caca-config.1.gz
+man/man1/cacademo.1.gz
+man/man1/cacafire.1.gz
+man/man1/cacaplay.1.gz
+man/man1/cacaserver.1.gz
+man/man1/cacaview.1.gz
+man/man1/img2txt.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310190032.r9J0W8YD028760>