Index: head/games/gcompris/Makefile
===================================================================
--- head/games/gcompris/Makefile	(revision 30997)
+++ head/games/gcompris/Makefile	(revision 30998)
@@ -1,36 +1,42 @@
 # New ports collection makefile for:	gcompris
 # Date created:		21 July 2000
 # Whom:			Maxim Sobolev
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcompris
 PORTVERSION= 	0.2.3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
+RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-extract:
 	@${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
 	@${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
+	@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \
+		 s|\$\(datadir\)/sounds|\$\(datadir\)/gnome/sounds|g ; \
+		 s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g'
 
 .include <bsd.port.mk>

Property changes on: head/games/gcompris/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/games/gcompris/files/patch-ac
===================================================================
--- head/games/gcompris/files/patch-ac	(revision 30997)
+++ head/games/gcompris/files/patch-ac	(revision 30998)
@@ -1,17 +1,15 @@
---- Makefile.in.orig	Thu Jul 20 03:19:15 2000
-+++ Makefile.in	Fri Jul 21 18:32:23 2000
-@@ -114,11 +114,11 @@
+--- Makefile.in.orig	Mon Jul 24 19:02:08 2000
++++ Makefile.in	Mon Jul 24 19:02:52 2000
+@@ -178,9 +178,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
  
- SUBDIRS = intl po macros src sounds
- 
--pixmapdir = $(datadir)/pixmaps/gcompris
--icondir = $(datadir)/pixmaps
-+pixmapdir = $(PACKAGE_PIXMAPS_DIR)
-+icondir = $(PIXMAPS_DIR)
- soundlistdir = $(sysconfdir)/sound/events
- Gamesdir = $(datadir)/gnome/apps/Games
--scoredir = $(localstatedir)/games
-+scoredir = $(SCORE_DIR)
- 
- leveldatadir = $(datadir)/gcompris/data
+ mostlyclean-hdr:
  

Property changes on: head/games/gcompris/files/patch-ac
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/games/gcompris2/Makefile
===================================================================
--- head/games/gcompris2/Makefile	(revision 30997)
+++ head/games/gcompris2/Makefile	(revision 30998)
@@ -1,36 +1,42 @@
 # New ports collection makefile for:	gcompris
 # Date created:		21 July 2000
 # Whom:			Maxim Sobolev
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcompris
 PORTVERSION= 	0.2.3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
+RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-extract:
 	@${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
 	@${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
+	@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \
+		 s|\$\(datadir\)/sounds|\$\(datadir\)/gnome/sounds|g ; \
+		 s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g'
 
 .include <bsd.port.mk>

Property changes on: head/games/gcompris2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/games/gcompris2/files/patch-ac
===================================================================
--- head/games/gcompris2/files/patch-ac	(revision 30997)
+++ head/games/gcompris2/files/patch-ac	(revision 30998)
@@ -1,17 +1,15 @@
---- Makefile.in.orig	Thu Jul 20 03:19:15 2000
-+++ Makefile.in	Fri Jul 21 18:32:23 2000
-@@ -114,11 +114,11 @@
+--- Makefile.in.orig	Mon Jul 24 19:02:08 2000
++++ Makefile.in	Mon Jul 24 19:02:52 2000
+@@ -178,9 +178,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
  
- SUBDIRS = intl po macros src sounds
- 
--pixmapdir = $(datadir)/pixmaps/gcompris
--icondir = $(datadir)/pixmaps
-+pixmapdir = $(PACKAGE_PIXMAPS_DIR)
-+icondir = $(PIXMAPS_DIR)
- soundlistdir = $(sysconfdir)/sound/events
- Gamesdir = $(datadir)/gnome/apps/Games
--scoredir = $(localstatedir)/games
-+scoredir = $(SCORE_DIR)
- 
- leveldatadir = $(datadir)/gcompris/data
+ mostlyclean-hdr:
  

Property changes on: head/games/gcompris2/files/patch-ac
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property