mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00
Code Issues Releases Activity

Update to 5.2

Browse Source 
Submitted by:	jhay
This commit is contained in:
Alexander Nedotsukov 2004-03-05 02:55:55 +00:00
parent 12674e3de8
commit f5d34af7c5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=102968
9 changed files with 929 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
games/gcompris2/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= gcompris2
PORTVERSION= 2.1
PORTREVISION= 5
PORTVERSION= 5.2
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gcompris
@ -17,14 +16,17 @@ MAINTAINER= gnome@freebsd.org
COMMENT= A simple Gnome2-based education game for children starting at 3
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
ao.3:${PORTSDIR}/audio/libao
ao.3:${PORTSDIR}/audio/libao \
assetml.0:${PORTSDIR}/devel/libassetml
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_PYTHON= yes
USE_GNOME= gnomehack lthack gnomeprefix libgnomeui pygnome2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib" \
LIBS="${PTHREAD_LIBS} -lm"
INFO= gcompris

3
games/gcompris2/distinfo
View File

@ -1 +1,2 @@
MD5 (gcompris-2.1.tar.gz) = a6653932eb97278c484125580db5ce72
MD5 (gcompris-5.2.tar.gz) = 93145ecf6cc4629afa3c0ed959793ee1
SIZE (gcompris-5.2.tar.gz) = 33275848

42
games/gcompris2/files/patch-ac
View File

@ -1,43 +1,27 @@
$FreeBSD$
--- Makefile.in.orig Sun Aug 4 23:01:03 2002
+++ Makefile.in Sun Aug 4 23:22:07 2002
@@ -219,9 +219,9 @@
rm -f $(srcdir)/stamp-h.in; \
$(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+# cd $(top_srcdir) && $(AUTOHEADER)
+# @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
--- Makefile.in.bak Thu Jan 29 07:52:30 2004
+++ Makefile.in Mon Feb 2 22:15:58 2004
@@ -671,7 +671,7 @@
mostlyclean-hdr:
info-am:
-install-data-am: install-ApplicationsDATA install-MenuDATA \
+install-data-am: install-ApplicationsDATA \
install-data-local install-iconDATA
@@ -453,7 +453,7 @@
install-exec-am:
install-exec: install-exec-recursive
-install-data-am: install-GamesDATA install-MenuDATA install-iconDATA \
+install-data-am: install-GamesDATA install-iconDATA \
install-data-local
install-data: install-data-recursive
@@ -526,13 +526,13 @@
@@ -733,13 +733,13 @@
@$(NORMAL_INSTALL)
if test -d @PACKAGE_DATA_DIR@; then \
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
- cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*.bak" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
- cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "Makefile.in*" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
fi
dist-hook:
if test -d @PACKAGE_DATA_DIR@; then \
$(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
- cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.bak" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
- cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "Makefile.in" --exclude "Makefile" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+ cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "Makefile.in*" --exclude "Makefile" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
fi
clean-local:

40
games/gcompris2/files/patch-configure
View File

@ -1,15 +1,7 @@
--- configure.orig Thu Feb 6 14:45:02 2003
+++ configure Wed Apr 23 10:27:26 2003
@@ -8769,6 +8769,7 @@
--- configure.orig Sat Feb 28 08:33:22 2004
+++ configure Sat Feb 28 11:14:06 2004
@@ -12767,7 +12767,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -11192,14 +11193,14 @@
PACKAGE_SOUNDS_DIR="sounds"
cat >>confdefs.h <<_ACEOF
-#define PACKAGE_SOUNDS_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/sounds"
@ -17,7 +9,8 @@
_ACEOF
PACKAGE_DATA_DIR="boards"
@@ -12775,7 +12775,7 @@
cat >>confdefs.h <<_ACEOF
-#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/boards"
@ -25,3 +18,26 @@
_ACEOF
@@ -12795,7 +12795,7 @@
cat >>confdefs.h <<_ACEOF
-#define GNOME_ICONDIR "${myprefix}/${DATADIRNAME}/pixmaps"
+#define GNOME_ICONDIR "${myprefix}/${DATADIRNAME}/gnome/pixmaps"
_ACEOF
@@ -13372,11 +13372,11 @@
-ASSETML_DIR=assetml
+ASSETML_DIR=gnome/assetml
cat >>confdefs.h <<_ACEOF
-#define ASSETML_DIR "${myprefix}/${DATADIRNAME}/${ASSETML_DIR}"
+#define ASSETML_DIR "${myprefix}/${DATADIRNAME}/gnome/${ASSETML_DIR}"
_ACEOF

14
games/gcompris2/files/patch-po::Makefile.in.in
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- po/Makefile.in.in 2002/05/30 13:59:02 1.1
+++ po/Makefile.in.in 2002/05/30 13:59:32
@@ -12,7 +12,7 @@
# - Modified by jacob berkman <jacob@ximian.com> to install
# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GETTEXT_PACKAGE = gcompris
PACKAGE = @PACKAGE@
VERSION = @VERSION@

10
games/gcompris2/files/patch-src::boards::menu.c
View File

@ -1,10 +0,0 @@
--- src/boards/menu.c.orig Wed Apr 23 21:38:22 2003
+++ src/boards/menu.c Wed Apr 23 21:39:20 2003
@@ -153,6 +153,7 @@
gcomprisBoard->maxlevel=1;
gcompris_bar_set(GCOMPRIS_BAR_CONFIG|GCOMPRIS_BAR_ABOUT);
+ gnome_canvas_update_now(gcomprisBoard->canvas);
menu_pause(FALSE);
}

11
games/gcompris2/files/patch-src::boards::traffic.c
View File

@ -1,11 +0,0 @@
--- src/boards/traffic.c.orig Wed Apr 23 10:39:07 2003
+++ src/boards/traffic.c Wed Apr 23 10:39:32 2003
@@ -74,7 +74,7 @@
guint num_cars;
guint card;
guint level;
- car *cars[];
+ car **cars;
};
static int car_cb(GnomeCanvasItem *item, GdkEvent *event, car *thiscar);

23
games/gcompris2/files/patch-src::gcompris::soundutil.c
View File

@ -1,13 +1,18 @@
$FreeBSD$
--- src/gcompris/soundutil.c 2002/03/20 10:35:57 1.1
+++ src/gcompris/soundutil.c 2002/03/20 10:36:14
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
--- src/gcompris/soundutil.c.orig Sun Dec 7 07:12:51 2003
+++ src/gcompris/soundutil.c Mon Feb 2 21:44:57 2004
@@ -22,6 +22,7 @@
#endif
#include <dirent.h>
+#include <signal.h>
#include "gcompris.h"
#include <signal.h>
#include <pthread.h>
@@ -176,6 +177,7 @@
{
int err;
static GList *pending_queue = NULL;
+ pthread_mutex_lock( &lock );
err = pthread_cond_wait (&cond, &lock);
if (err)
printf ("cond_wait : %s\n", strerror (err));

1322
games/gcompris2/pkg-plist
View File

File diff suppressed because it is too large Load Diff