aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/modules2
-rw-r--r--MOVED1
-rw-r--r--games/Makefile2
-rw-r--r--games/gnome-games-extra-data/Makefile3
-rw-r--r--games/gnomegames2-extra-data/Makefile30
-rw-r--r--games/gnomegames2-extra-data/distinfo3
-rw-r--r--games/gnomegames2-extra-data/pkg-descr3
-rw-r--r--games/gnomegames2-extra-data/pkg-plist31
-rw-r--r--x11/gnome2-fifth-toe/Makefile2
9 files changed, 5 insertions, 72 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index 6b0a276cf1ae..0ae483fb092f 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3227,6 +3227,7 @@ gnome-cups-manager ports/print/gnome-cups-manager
gnome-db ports/databases/gnome-db
gnome-font-sampler ports/x11-fonts/gnome-font-sampler
gnome-games ports/games/gnome-games
+gnome-games-extra-data ports/games/gnome-games-extra-data
gnome-icon-theme ports/misc/gnome-icon-theme
gnome-icons ports/x11-themes/gnome-icons
gnome-icons-aqua-fusion ports/x11-themes/gnome-icons-aqua-fusion
@@ -3293,7 +3294,6 @@ gnomedesktop ports/x11/gnomedesktop
gnomedesktop-reference ports/x11/gnomedesktop-reference
gnomedocutils ports/textproc/gnomedocutils
gnomefind ports/sysutils/gnomefind
-gnomegames2-extra-data ports/games/gnomegames2-extra-data
gnomehier ports/misc/gnomehier
gnomeiconedit ports/graphics/gnomeiconedit
gnomeicu2 ports/net-im/gnomeicu2
diff --git a/MOVED b/MOVED
index 695f188410b4..1df233a0ac8c 100644
--- a/MOVED
+++ b/MOVED
@@ -2316,3 +2316,4 @@ games/gcompris2|games/gcompris|2006-05-28|Renamed to use real vendor package nam
games/gnomegames2|games/gnome-games|2006-05-28|Renamed to use real vendor package name
irc/xchat2|irc/xchat|2006-05-28|Use unversioned name for latest version
misc/gnomemimedata|misc/gnome-mime-data|2006-05-28|Renamed to use real vendor package name
+games/gnomegames2-extra-data|games/gnome-games-extra-data|2006-05-28|Renamed to use real vendor package name
diff --git a/games/Makefile b/games/Makefile
index 4c42fc272944..7364e1216226 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -239,11 +239,11 @@
SUBDIR += gnmm
SUBDIR += gno3dtet
SUBDIR += gnome-games
+ SUBDIR += gnome-games-extra-data
SUBDIR += gnome-music-quiz
SUBDIR += gnomeattacks
SUBDIR += gnomebreakout
SUBDIR += gnomechess
- SUBDIR += gnomegames2-extra-data
SUBDIR += gnomekiss
SUBDIR += gnomememoryblocks
SUBDIR += gnomermind
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 53ac73c7335b..69dcd2eb46ab 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -6,12 +6,11 @@
# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.8 2006/04/22 18:07:24 marcus Exp $
#
-PORTNAME= gnomegames2-extra-data
+PORTNAME= gnome-games-extra-data
PORTVERSION= 2.14.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= gnome-games-extra-data-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile
deleted file mode 100644
index 53ac73c7335b..000000000000
--- a/games/gnomegames2-extra-data/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: gnomegames2-extra-data
-# Date created: 16 August 2004
-# Whom: Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.8 2006/04/22 18:07:24 marcus Exp $
-#
-
-PORTNAME= gnomegames2-extra-data
-PORTVERSION= 2.14.0
-CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= gnome-games-extra-data-${PORTVERSION}
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Themes and artwork for the gnome-games package
-
-RUN_DEPENDS= ${X11BASE}/bin/sol:${PORTSDIR}/games/gnome-games
-
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomehack gnomeprefix gnometarget
-CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo
deleted file mode 100644
index 57806d4acbd4..000000000000
--- a/games/gnomegames2-extra-data/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 01464739e83449288c6a58685604f86e
-SHA256 (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 2785206387d7444f37e27dbb606e587ca282f7ba54723b052e6c44dcca99a39e
-SIZE (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 2868801
diff --git a/games/gnomegames2-extra-data/pkg-descr b/games/gnomegames2-extra-data/pkg-descr
deleted file mode 100644
index 992c00ea920e..000000000000
--- a/games/gnomegames2-extra-data/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains extra data files for the gnome-games package. At
-the moment this is almost entirely extra themes and artwork for the
-games.
diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist
deleted file mode 100644
index 1a9fb8c47434..000000000000
--- a/games/gnomegames2-extra-data/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-share/gnome/gnome-games/same-gnome/themes/2.10/blink.png
-share/gnome/gnome-games/same-gnome/themes/2.10/glass.png
-share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png
-share/gnome/gnome-games/same-gnome/themes/2.10/matrix.png
-share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg
-share/gnome/pixmaps/glines/classic.png
-share/gnome/pixmaps/glines/dots.png
-share/gnome/pixmaps/glines/gumball.png
-share/gnome/pixmaps/glines/pulse.png
-share/gnome/pixmaps/gnobots2/cows.png
-share/gnome/pixmaps/gnobots2/eggs.png
-share/gnome/pixmaps/gnobots2/mice.png
-share/gnome/pixmaps/gnome-games-common/cards/bellot.svg
-share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg
-share/gnome/pixmaps/gnome-games-common/cards/ornamental.svg
-share/gnome/pixmaps/gnometris/5blocks-tig.png
-share/gnome/pixmaps/gnometris/5blocks-tim.png
-share/gnome/pixmaps/gnometris/5blocks.png
-share/gnome/pixmaps/gnometris/7blocks.png
-share/gnome/pixmaps/gnometris/7stones-gn.png
-share/gnome/pixmaps/gnometris/7stones2-gn.png
-share/gnome/pixmaps/iagno/blend.png
-share/gnome/pixmaps/iagno/flipblend.png
-share/gnome/pixmaps/iagno/metal.png
-share/gnome/pixmaps/iagno/metal2.png
-share/gnome/pixmaps/iagno/shrink.png
-share/gnome/pixmaps/iagno/sunmoon.png
-share/gnome/pixmaps/mahjongg/default.png
-share/gnome/pixmaps/mahjongg/default2.png
-share/gnome/pixmaps/mahjongg/maya.png
-share/gnome/pixmaps/mahjongg/seta.png
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 97a1febf6e66..1f0c03089c92 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \
gnotime:${PORTSDIR}/deskutils/gnotime \
rhythmbox:${PORTSDIR}/audio/rhythmbox \
jamboree:${PORTSDIR}/audio/jamboree \
- ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data \
+ ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
goobox:${PORTSDIR}/audio/goobox \
inkscape:${PORTSDIR}/graphics/inkscape \