svn commit: r352376 - in head: devel/libgii graphics/libggi

[Antoine Brodin]

Author: antoine
Date: Sat Apr 26 21:16:13 2014
New Revision: 352376
URL: http://svnweb.freebsd.org/changeset/ports/352376
QAT: https://qat.redports.org/buildarchive/r352376/

Log:
  - Use libtool and tar:bzip2
  - Strip binaries
  - Use sample keyword

Modified:
  head/devel/libgii/Makefile
  head/devel/libgii/pkg-plist
  head/graphics/libggi/Makefile
  head/graphics/libggi/pkg-plist

Modified: head/devel/libgii/Makefile
==============================================================================
--- head/devel/libgii/Makefile	Sat Apr 26 21:12:45 2014	(r352375)
+++ head/devel/libgii/Makefile	Sat Apr 26 21:16:13 2014	(r352376)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgii
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -14,9 +14,10 @@ COMMENT=	GGI API for input sources
 LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_BZIP2=	yes
+USES=		libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
@@ -51,8 +52,8 @@ PLIST_SUB+=	VGL="@comment "
 .endif
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/libgii.conf ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf.dist
-	${INSTALL_DATA} ${WRKSRC}/filter/mouse/mouse ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse.dist
-	${INSTALL_DATA} ${WRKSRC}/filter/keytrans/keytrans ${STAGEDIR}${PREFIX}/etc/ggi/filter/keytrans.dist
+	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/filter/keytrans ${STAGEDIR}${PREFIX}/etc/ggi/filter/keytrans.sample
 
 .include <bsd.port.mk>

Modified: head/devel/libgii/pkg-plist
==============================================================================
--- head/devel/libgii/pkg-plist	Sat Apr 26 21:12:45 2014	(r352375)
+++ head/devel/libgii/pkg-plist	Sat Apr 26 21:16:13 2014	(r352376)
@@ -1,14 +1,8 @@
 bin/mhub
 %%WITH_X%%bin/xsendbut
- at unexec if cmp -s %D/etc/ggi/filter/keytrans %D/etc/ggi/filter/keytrans.dist; then rm -f %D/etc/ggi/filter/keytrans; fi
-etc/ggi/filter/keytrans.dist
- at exec [ -f %B/keytrans ] || cp %B/%f %B/keytrans
- at unexec if cmp -s %D/etc/ggi/filter/mouse %D/etc/ggi/filter/mouse.dist; then rm -f %D/etc/ggi/filter/mouse; fi
-etc/ggi/filter/mouse.dist
- at exec [ -f %B/mouse ] || cp %B/%f %B/mouse
- at unexec if cmp -s %D/etc/ggi/libgii.conf %D/etc/ggi/libgii.conf.dist; then rm -f %D/etc/ggi/libgii.conf; fi
-etc/ggi/libgii.conf.dist
- at exec [ -f %B/libgii.conf ] || cp %B/%f %B/libgii.conf
+ at sample etc/ggi/filter/keytrans.sample
+ at sample etc/ggi/filter/mouse.sample
+ at sample etc/ggi/libgii.conf.sample
 include/ggi/errors.h
 include/ggi/events.h
 include/ggi/gg-defs.h
@@ -64,10 +58,12 @@ lib/libgg.a
 lib/libgg.la
 lib/libgg.so
 lib/libgg.so.1
+lib/libgg.so.1.0.0
 lib/libgii.a
 lib/libgii.la
 lib/libgii.so
 lib/libgii.so.1
+lib/libgii.so.1.0.0
 man/man1/mhub.1.gz
 man/man1/xsendbut.1.gz
 man/man3/GG_CIRCLEQ_EMPTY.3.gz

Modified: head/graphics/libggi/Makefile
==============================================================================
--- head/graphics/libggi/Makefile	Sat Apr 26 21:12:45 2014	(r352375)
+++ head/graphics/libggi/Makefile	Sat Apr 26 21:16:13 2014	(r352376)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libggi
 PORTVERSION=	2.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION}
@@ -14,17 +14,16 @@ COMMENT=	Flexible drawing library
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	gii:${PORTSDIR}/devel/libgii
+LIB_DEPENDS=	libgii.so:${PORTSDIR}/devel/libgii
 
-USE_BZIP2=	yes
+USES=		libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
-
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-directfb
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 LDFLAGS+=	${PTHREAD_LIBS}
+INSTALL_TARGET=	install-strip
 
-CONFIGURE_ARGS=	--disable-directfb
 
 OPTIONS_DEFINE=	AALIB SVGALIB X11
 OPTIONS_DEFAULT=X11
@@ -74,6 +73,6 @@ post-install:
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/fbdev/.keep
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/kgi/.keep
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/helper/.keep
-	${INSTALL_DATA} ${WRKSRC}/libggi.conf ${STAGEDIR}${PREFIX}/etc/ggi/libggi.conf.dist
+	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/libggi.conf ${STAGEDIR}${PREFIX}/etc/ggi/libggi.conf.sample
 
 .include <bsd.port.mk>

Modified: head/graphics/libggi/pkg-plist
==============================================================================
--- head/graphics/libggi/pkg-plist	Sat Apr 26 21:12:45 2014	(r352375)
+++ head/graphics/libggi/pkg-plist	Sat Apr 26 21:16:13 2014	(r352376)
@@ -1,9 +1,7 @@
 bin/ggiteleserver
 bin/cube3d
 bin/monitest
- at unexec if cmp -s %D/etc/ggi/libggi.conf %D/etc/ggi/libggi.conf.dist; then rm -f %D/etc/ggi/libggi.conf; fi
-etc/ggi/libggi.conf.dist
- at exec [ -f %B/libggi.conf ] || cp %B/%f %B/libggi.conf
+ at sample etc/ggi/libggi.conf.sample
 include/ggi/display/aa.h
 include/ggi/display/auto.h
 include/ggi/display/directx.h
@@ -136,6 +134,7 @@ lib/libggi.a
 lib/libggi.la
 lib/libggi.so
 lib/libggi.so.2
+lib/libggi.so.2.0.2
 man/man1/cube3d.1.gz
 man/man1/demo.1.gz
 man/man1/ggi-demo.1.gz