summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-08-25 01:29:25 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-08-25 01:29:25 +0800
commit5c377714e12b6f137c7f32b6ba28a2908a00c634 (patch)
treeb0e503945177ce130739f9b70b973c1852e5e12a
parentf9a1d76d62154d5ead5c0ffbe9430f267dc2a625 (diff)
downloadmarcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.tar
marcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.tar.gz
marcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.tar.bz2
marcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.tar.lz
marcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.tar.xz
marcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.tar.zst
marcuscom-ports-5c377714e12b6f137c7f32b6ba28a2908a00c634.zip
Merge recent changes from FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1081 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--games/gcompris2/Makefile10
-rw-r--r--games/gcompris2/pkg-plist3
2 files changed, 6 insertions, 7 deletions
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 41c3141f7..6568f6ba5 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcompris2
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gcompris
@@ -16,14 +16,16 @@ DISTNAME= gcompris-${PORTVERSION}
MAINTAINER= gnome@freebsd.org
COMMENT= A simple Gnome2-based education game for children starting at 3
-LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis \
+ ao.3:${PORTSDIR}/audio/libao
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
-USE_REINPLACE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+INFO= gcompris
.include <bsd.port.mk>
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index 11839b779..103130588 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -1,8 +1,5 @@
bin/gcompris
bin/gcompris-edit
-@unexec install-info --delete %D/info/gcompris.info %D/info/dir
-info/gcompris.info
-@exec install-info %D/info/gcompris.info %D/info/dir
lib/gcompris/libadvanced_colors.so
lib/gcompris/libalgebra.so
lib/gcompris/libalgebra_guesscount.so