Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Oct 2013 07:53:37 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332084 - in head/games/briquolo: . files
Message-ID:  <201310300753.r9U7rbnP071082@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Wed Oct 30 07:53:37 2013
New Revision: 332084
URL: http://svnweb.freebsd.org/changeset/ports/332084

Log:
  - Fix build on CURRENT
  - Enable staging
  - Re-order LIB_DEPENDS and switch to new format
  - Update USES

Added:
  head/games/briquolo/files/
  head/games/briquolo/files/patch-desktop-Makefile.in   (contents, props changed)
  head/games/briquolo/files/patch-src-Constante.cpp   (contents, props changed)
Modified:
  head/games/briquolo/Makefile
  head/games/briquolo/pkg-plist   (contents, props changed)

Modified: head/games/briquolo/Makefile
==============================================================================
--- head/games/briquolo/Makefile	Wed Oct 30 07:18:50 2013	(r332083)
+++ head/games/briquolo/Makefile	Wed Oct 30 07:53:37 2013	(r332084)
@@ -3,23 +3,22 @@
 
 PORTNAME=	briquolo
 PORTVERSION=	0.5.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://briquolo.free.fr/download/
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Breakout clone with an OpenGL 3D representation
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
-
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+
 USE_BZIP2=	yes
 USES=		iconv
 USE_GL=		gl
 USE_SDL=	mixer sdl ttf
-USE_GMAKE=	yes
-USE_GNOME=	desktopfileutils
+USES=	gmake desktop-file-utils
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -27,22 +26,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-#.if defined(WITHOUT_NLS)
-#BROKEN=	Unsupported: wants to link against libintl anyway
-#CONFIGURE_ARGS+=	--disable-nls
-#PLIST_SUB+=	NLS="@comment "
-#.else
+# Mandatory: wants to link against libintl anyway
 USES+=		gettext
 PLIST_SUB+=	NLS=""
-#.endif
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|g' \
 		-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${WRKSRC}/src/MOGL/MOGL_Image.cpp
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>

Added: head/games/briquolo/files/patch-desktop-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/briquolo/files/patch-desktop-Makefile.in	Wed Oct 30 07:53:37 2013	(r332084)
@@ -0,0 +1,11 @@
+--- desktop/Makefile.in.orig	2013-10-29 17:36:03.000000000 +0100
++++ desktop/Makefile.in	2013-10-29 17:36:23.000000000 +0100
+@@ -204,7 +204,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-icondir = $(DESTDIR)$(datadir)/pixmaps
++icondir = $(datadir)/pixmaps
+ icon_DATA = briquolo.svg
+ EXTRA_DIST = briquolo.desktop briquolo.svg
+ all: all-am

Added: head/games/briquolo/files/patch-src-Constante.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/briquolo/files/patch-src-Constante.cpp	Wed Oct 30 07:53:37 2013	(r332084)
@@ -0,0 +1,10 @@
+--- src/Constante.cpp.orig	2013-10-29 17:15:21.000000000 +0100
++++ src/Constante.cpp	2013-10-29 17:18:30.000000000 +0100
+@@ -32,6 +32,7 @@
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+ #else
++#include <cstdlib>
+ #include <unistd.h>
+ #endif
+ 

Modified: head/games/briquolo/pkg-plist
==============================================================================
--- head/games/briquolo/pkg-plist	Wed Oct 30 07:18:50 2013	(r332083)
+++ head/games/briquolo/pkg-plist	Wed Oct 30 07:53:37 2013	(r332084)
@@ -113,5 +113,3 @@ share/pixmaps/briquolo.svg
 %%NLS%%share/locale/pl/LC_MESSAGES/briquolo.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/briquolo.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/briquolo.mo
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true



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