diff options
| -rw-r--r-- | CVSROOT/modules | 2 | ||||
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | audio/Makefile | 2 | ||||
| -rw-r--r-- | audio/gnomeaudio2/Makefile | 25 | ||||
| -rw-r--r-- | audio/gnomeaudio2/distinfo | 3 | ||||
| -rw-r--r-- | audio/gnomeaudio2/files/patch-Makefile | 19 | ||||
| -rw-r--r-- | audio/gnomeaudio2/pkg-descr | 1 | ||||
| -rw-r--r-- | audio/gnomeaudio2/pkg-plist | 18 | ||||
| -rw-r--r-- | deskutils/timer-applet/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome2-lite/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome2/Makefile | 2 |
11 files changed, 6 insertions, 71 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules index 7cd52f7ab266..5a1ac04c656e 100644 --- a/CVSROOT/modules +++ b/CVSROOT/modules @@ -3211,6 +3211,7 @@ gnofin ports/finance/gnofin gnofract4d ports/graphics/gnofract4d gnokii ports/comms/gnokii gnome-art ports/x11-themes/gnome-art +gnome-audio ports/audio/gnome-audio gnome-backgrounds ports/x11-themes/gnome-backgrounds gnome-blog ports/deskutils/gnome-blog gnome-bluecurve-theme ports/x11-themes/gnome-bluecurve-theme @@ -3275,7 +3276,6 @@ gnome2-office ports/editors/gnome2-office gnome2-power-tools ports/x11/gnome2-power-tools gnomeapplets2 ports/x11/gnomeapplets2 gnomeattacks ports/games/gnomeattacks -gnomeaudio2 ports/audio/gnomeaudio2 gnomebaker ports/sysutils/gnomebaker gnomebasic ports/lang/gnomebasic gnomebreakout ports/games/gnomebreakout @@ -2306,3 +2306,4 @@ deskutils/gnomepim|deskutils/gnome-pim|2006-05-27|Renamed to use real vendor pac devel/gnomebuild|devel/gnome-build|2006-05-27|Renamed to use real vendor package name devel/gnomecommon|devel/gnome-common|2006-05-27|Renamed to use real vendor package name archivers/fileroller|archivers/file-roller|2006-05-27|Renamed to use real vendor package name +audio/gnomeaudio2|audio/gnome-audio|2006-05-27|Renamed to use real vendor package name diff --git a/audio/Makefile b/audio/Makefile index e9f54045b340..ecd048bc5879 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -174,7 +174,7 @@ SUBDIR += gmpc SUBDIR += gmpccaa SUBDIR += gnapster - SUBDIR += gnomeaudio2 + SUBDIR += gnome-audio SUBDIR += gnomemedia2 SUBDIR += gnomoradio SUBDIR += gnowavcut diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile deleted file mode 100644 index 7bb0197155ca..000000000000 --- a/audio/gnomeaudio2/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# New ports collection makefile for: gnomeaudio2 -# Date created: 10 July 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gnomeaudio -PORTVERSION= 2.0.0 -CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-audio/2.0 -PKGNAMESUFFIX= 2 -DISTNAME= gnome-audio-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Sound files for use with GNOME 2 - -USE_BZIP2= yes -USE_X_PREFIX= yes -NO_BUILD= yes -USE_GNOME= gnomehack gnomeprefix gnomehier -WRKSRC= ${WRKDIR}/${DISTNAME}/sounds - -.include <bsd.port.mk> diff --git a/audio/gnomeaudio2/distinfo b/audio/gnomeaudio2/distinfo deleted file mode 100644 index 13f93a33f0ac..000000000000 --- a/audio/gnomeaudio2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome-audio-2.0.0.tar.bz2) = cd14b84af59fb2ec673527d32f4e379f -SHA256 (gnome-audio-2.0.0.tar.bz2) = b1587b720056f44c2c472f1157fa73b10a7ffe0fd2f68cf105b39b93bcf280f8 -SIZE (gnome-audio-2.0.0.tar.bz2) = 1401319 diff --git a/audio/gnomeaudio2/files/patch-Makefile b/audio/gnomeaudio2/files/patch-Makefile deleted file mode 100644 index f5556e24f16d..000000000000 --- a/audio/gnomeaudio2/files/patch-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.orig Thu Feb 15 14:40:33 2001 -+++ Makefile Mon Feb 26 19:24:22 2001 -@@ -1,3 +1 @@ --prefix=$(shell gnome-config --prefix) -- - LN_S=ln -sf -@@ -14,4 +12,4 @@ - for I in *.wav */*.wav ; do \ -- $(MKINSTALLDIRS) $(prefix)/share/sounds/`dirname $$I`; \ -- $(INSTALL_DATA) $$I $(prefix)/share/sounds/$$I; \ -+ $(MKINSTALLDIRS) $(PREFIX)/share/gnome/sounds/`dirname $$I`; \ -+ $(INSTALL_DATA) $$I $(PREFIX)/share/gnome/sounds/$$I; \ - done -@@ -19,3 +17,3 @@ - install-default-links: -- $(LN_S) startup3.wav $(prefix)/share/sounds/login.wav -- $(LN_S) shutdown1.wav $(prefix)/share/sounds/logout.wav -+ $(LN_S) startup3.wav $(PREFIX)/share/gnome/sounds/login.wav -+ $(LN_S) shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav diff --git a/audio/gnomeaudio2/pkg-descr b/audio/gnomeaudio2/pkg-descr deleted file mode 100644 index 02b911e2de13..000000000000 --- a/audio/gnomeaudio2/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This module holds sound files for use with GNOME 2. diff --git a/audio/gnomeaudio2/pkg-plist b/audio/gnomeaudio2/pkg-plist deleted file mode 100644 index 93609a8dc24a..000000000000 --- a/audio/gnomeaudio2/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -share/gnome/sounds/card_shuffle.wav -share/gnome/sounds/email.wav -share/gnome/sounds/error.wav -share/gnome/sounds/generic.wav -share/gnome/sounds/gtk-events/activate.wav -share/gnome/sounds/gtk-events/clicked.wav -share/gnome/sounds/gtk-events/toggled.wav -share/gnome/sounds/info.wav -share/gnome/sounds/login.wav -share/gnome/sounds/logout.wav -share/gnome/sounds/panel/slide.wav -share/gnome/sounds/phone.wav -share/gnome/sounds/question.wav -share/gnome/sounds/shutdown1.wav -share/gnome/sounds/startup3.wav -share/gnome/sounds/warning.wav -@dirrm share/gnome/sounds/gtk-events -@dirrm share/gnome/sounds/panel diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile index f7629b3690f4..313e6a21df43 100644 --- a/deskutils/timer-applet/Makefile +++ b/deskutils/timer-applet/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= timerapplet MAINTAINER= jylefort@FreeBSD.org COMMENT= A timer applet for the GNOME panel -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnomeaudio2 +RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack GNU_CONFIGURE= yes diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index f7be6aa0fd1f..13f0b60862c8 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ - ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ + ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ file-roller:${PORTSDIR}/archivers/file-roller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ evince:${PORTSDIR}/graphics/evince \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 6dec88100ebd..77764558a4ea 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -32,7 +32,7 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 yelp:${PORTSDIR}/x11/yelp \ ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ - ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ + ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ file-roller:${PORTSDIR}/archivers/file-roller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ |