From e68ba8be55f5ef2bbcab8e670c8c6054fe7eaac5 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Wed, 8 May 2002 22:35:43 +0000 Subject: Add gnomecontrolcenter2 after repo copy from gnomecontrolcenter. This is the configuration frontend for the GNOME 2.0 desktop. --- sysutils/Makefile | 1 + sysutils/gnome-control-center/Makefile | 26 +- sysutils/gnome-control-center/distinfo | 2 +- .../gnome-control-center/files/patch-Makefile.in | 14 - sysutils/gnome-control-center/files/patch-ad | 11 - sysutils/gnome-control-center/files/patch-bn | 16 - .../files/patch-capplets::Makefile.in.orig | 7 - .../files/patch-capplets::theme-switcher::lister.c | 15 - ...tch-capplets_file-types_file-types-icon-entry.c | 11 - .../patch-capplets_mouse_gnome-mouse-properties.c | 29 ++ sysutils/gnome-control-center/files/patch-ce | 8 - .../gnome-control-center/files/patch-configure | 22 +- .../gnome-control-center/files/patch-ltmain.sh | 45 --- .../files/patch-po::Makefile.in.in | 14 - sysutils/gnome-control-center/pkg-comment | 2 +- sysutils/gnome-control-center/pkg-descr | 2 +- sysutils/gnome-control-center/pkg-plist | 365 +++++++++------------ sysutils/gnomecontrolcenter2/Makefile | 26 +- sysutils/gnomecontrolcenter2/distinfo | 2 +- .../gnomecontrolcenter2/files/patch-Makefile.in | 14 - sysutils/gnomecontrolcenter2/files/patch-ad | 11 - sysutils/gnomecontrolcenter2/files/patch-bn | 16 - .../files/patch-capplets::Makefile.in.orig | 7 - .../files/patch-capplets::theme-switcher::lister.c | 15 - ...tch-capplets_file-types_file-types-icon-entry.c | 11 - .../patch-capplets_mouse_gnome-mouse-properties.c | 29 ++ sysutils/gnomecontrolcenter2/files/patch-ce | 8 - sysutils/gnomecontrolcenter2/files/patch-configure | 22 +- sysutils/gnomecontrolcenter2/files/patch-ltmain.sh | 45 --- .../files/patch-po::Makefile.in.in | 14 - sysutils/gnomecontrolcenter2/pkg-comment | 2 +- sysutils/gnomecontrolcenter2/pkg-descr | 2 +- sysutils/gnomecontrolcenter2/pkg-plist | 365 +++++++++------------ 33 files changed, 439 insertions(+), 740 deletions(-) delete mode 100644 sysutils/gnome-control-center/files/patch-Makefile.in delete mode 100644 sysutils/gnome-control-center/files/patch-ad delete mode 100644 sysutils/gnome-control-center/files/patch-bn delete mode 100644 sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c delete mode 100644 sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c create mode 100644 sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c delete mode 100644 sysutils/gnome-control-center/files/patch-ce delete mode 100644 sysutils/gnome-control-center/files/patch-ltmain.sh delete mode 100644 sysutils/gnome-control-center/files/patch-po::Makefile.in.in delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-Makefile.in delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-ad delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-bn delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c create mode 100644 sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-ce delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-ltmain.sh delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-po::Makefile.in.in diff --git a/sysutils/Makefile b/sysutils/Makefile index 49c3e944b5a3..9a7264dd9689 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -69,6 +69,7 @@ SUBDIR += gkrellmouse SUBDIR += glload SUBDIR += gnomecontrolcenter + SUBDIR += gnomecontrolcenter2 SUBDIR += gnomefind SUBDIR += gpart SUBDIR += grub diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 06b89691fae7..15590ba11077 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -1,38 +1,38 @@ -# New ports collection makefile for: control-center -# Date created: 29 Dec 1998 -# Whom: Vanilla I. Shu +# New ports collection makefile for: gnomecontrolcenter2 +# Date created: 04 May 2002 +# Whom: Joe Marcus Clarke # # $FreeBSD$ # -PORTNAME= gnomecontrolcenter -PORTVERSION= 1.4.0.5 -PORTREVISION= 1 +PORTNAME= gnomecontrolcenter2 +PORTVERSION= 1.99.9 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/control-center +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020501 DISTNAME= control-center-${PORTVERSION} -DIST_SUBDIR= gnome +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \ - gnomevfs.0:${PORTSDIR}/devel/gnomevfs +LIB_DEPENDS= gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMELIBS= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index c01839601f22..30c800f4dfb1 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (gnome/control-center-1.4.0.5.tar.bz2) = 63e731f7c9f5fca354de5de4f881e952 +MD5 (gnome2/control-center-1.99.9.tar.bz2) = 339cab7a6f0cb812eec342e0d6ac8fbc diff --git a/sysutils/gnome-control-center/files/patch-Makefile.in b/sysutils/gnome-control-center/files/patch-Makefile.in deleted file mode 100644 index feb63528f70a..000000000000 --- a/sysutils/gnome-control-center/files/patch-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in 2002/02/05 09:46:12 1.1 -+++ Makefile.in 2002/02/05 09:46:25 -@@ -151,7 +151,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = control-center capplets idl doc omf-install man -+always_built_SUBDIRS = control-center capplets idl doc omf-install - - SUBDIRS = intl po macros \ - $(always_built_SUBDIRS) diff --git a/sysutils/gnome-control-center/files/patch-ad b/sysutils/gnome-control-center/files/patch-ad deleted file mode 100644 index c27189a35ee9..000000000000 --- a/sysutils/gnome-control-center/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999 -+++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999 -@@ -210,7 +210,7 @@ - gchar *tempdir; - gchar *name; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - diff --git a/sysutils/gnome-control-center/files/patch-bn b/sysutils/gnome-control-center/files/patch-bn deleted file mode 100644 index 294e18fe95ed..000000000000 --- a/sysutils/gnome-control-center/files/patch-bn +++ /dev/null @@ -1,16 +0,0 @@ ---- control-center/Makefile.in.orig Tue Aug 1 22:42:01 2000 -+++ control-center/Makefile.in Tue Aug 1 22:45:47 2000 -@@ -162,3 +162,3 @@ - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = cappletConf.sh -@@ -168,3 +168,3 @@ - --libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 5:0:0 - libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) -@@ -590,2 +590,3 @@ - -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \ -+ -e 's?\@VERSION\@?$(VERSION)?g' \ - < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \ diff --git a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig index c1c29de83cb1..e69de29bb2d1 100644 --- a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig +++ b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig @@ -1,7 +0,0 @@ ---- capplets/Makefile.in.orig Sun Feb 10 15:41:49 2002 -+++ capplets/Makefile.in Wed Feb 13 09:34:28 2002 -@@ -154,3 +154,3 @@ - always_built_SUBDIRS = desktop-links mouse-properties \ -- screensaver-properties background-properties \ -+ background-properties \ - theme-switcher sound-properties \ diff --git a/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c b/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c deleted file mode 100644 index ce8170370123..000000000000 --- a/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- capplets/theme-switcher/lister.c 2002/03/29 12:43:59 1.1 -+++ capplets/theme-switcher/lister.c 2002/03/29 12:45:18 -@@ -115,8 +115,7 @@ - char *errstring = NULL; - int out_fd; - #ifndef HAVE_GETLINE -- char line[1024]; -- char *lineptr = line; -+ char *lineptr = (char *)malloc(1024); - #else - char *lineptr = NULL; - #endif diff --git a/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c deleted file mode 100644 index 5b48cd25cb94..000000000000 --- a/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/file-types/file-types-icon-entry.c.orig Sun May 5 16:33:51 2002 -+++ capplets/file-types/file-types-icon-entry.c Sun May 5 16:34:02 2002 -@@ -424,7 +424,7 @@ - result = NULL; - filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry)); - if (filename != NULL) { -- path_parts = g_strsplit (filename, "/share/pixmaps/", 0); -+ path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0); - g_free (filename); - - if (path_parts[1] != NULL) { diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 000000000000..d5ce54f8ce00 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,29 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Sun May 5 01:04:48 2002 ++++ capplets/mouse/gnome-mouse-properties.c Sun May 5 01:05:10 2002 +@@ -532,7 +532,7 @@ + filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { +@@ -553,7 +553,7 @@ + filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { +@@ -574,7 +574,7 @@ + filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnome-control-center/files/patch-ce b/sysutils/gnome-control-center/files/patch-ce deleted file mode 100644 index b2186ac89c4c..000000000000 --- a/sysutils/gnome-control-center/files/patch-ce +++ /dev/null @@ -1,8 +0,0 @@ ---- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig Wed May 12 02:56:05 1999 -+++ capplets/wm-properties/wm-desktops/WindowMaker.desktop Wed May 12 02:56:22 1999 -@@ -5,4 +5,4 @@ - - [Window Manager] - SessionManaged=false --ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs -+ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 53566354e4ac..7e44bf49ffc1 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,11 +1,19 @@ ---- configure.orig Sun May 5 16:29:53 2002 -+++ configure Sun May 5 16:30:05 2002 -@@ -9161,7 +9161,7 @@ +--- configure.orig Mon May 6 01:33:23 2002 ++++ configure Mon May 6 01:33:51 2002 +@@ -7353,6 +7353,7 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS - cat >> confdefs.h <>confdefs.h < +# New ports collection makefile for: gnomecontrolcenter2 +# Date created: 04 May 2002 +# Whom: Joe Marcus Clarke # # $FreeBSD$ # -PORTNAME= gnomecontrolcenter -PORTVERSION= 1.4.0.5 -PORTREVISION= 1 +PORTNAME= gnomecontrolcenter2 +PORTVERSION= 1.99.9 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/control-center +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020501 DISTNAME= control-center-${PORTVERSION} -DIST_SUBDIR= gnome +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \ - gnomevfs.0:${PORTSDIR}/devel/gnomevfs +LIB_DEPENDS= gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMELIBS= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index c01839601f22..30c800f4dfb1 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1 +1 @@ -MD5 (gnome/control-center-1.4.0.5.tar.bz2) = 63e731f7c9f5fca354de5de4f881e952 +MD5 (gnome2/control-center-1.99.9.tar.bz2) = 339cab7a6f0cb812eec342e0d6ac8fbc diff --git a/sysutils/gnomecontrolcenter2/files/patch-Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-Makefile.in deleted file mode 100644 index feb63528f70a..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in 2002/02/05 09:46:12 1.1 -+++ Makefile.in 2002/02/05 09:46:25 -@@ -151,7 +151,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = control-center capplets idl doc omf-install man -+always_built_SUBDIRS = control-center capplets idl doc omf-install - - SUBDIRS = intl po macros \ - $(always_built_SUBDIRS) diff --git a/sysutils/gnomecontrolcenter2/files/patch-ad b/sysutils/gnomecontrolcenter2/files/patch-ad deleted file mode 100644 index c27189a35ee9..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999 -+++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999 -@@ -210,7 +210,7 @@ - gchar *tempdir; - gchar *name; - -- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); -+ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); - wm_list_read_dir (tempdir, FALSE); - g_free (tempdir); - diff --git a/sysutils/gnomecontrolcenter2/files/patch-bn b/sysutils/gnomecontrolcenter2/files/patch-bn deleted file mode 100644 index 294e18fe95ed..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-bn +++ /dev/null @@ -1,16 +0,0 @@ ---- control-center/Makefile.in.orig Tue Aug 1 22:42:01 2000 -+++ control-center/Makefile.in Tue Aug 1 22:45:47 2000 -@@ -162,3 +162,3 @@ - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = cappletConf.sh -@@ -168,3 +168,3 @@ - --libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 5:0:0 - libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) -@@ -590,2 +590,3 @@ - -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \ -+ -e 's?\@VERSION\@?$(VERSION)?g' \ - < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \ diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig index c1c29de83cb1..e69de29bb2d1 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig @@ -1,7 +0,0 @@ ---- capplets/Makefile.in.orig Sun Feb 10 15:41:49 2002 -+++ capplets/Makefile.in Wed Feb 13 09:34:28 2002 -@@ -154,3 +154,3 @@ - always_built_SUBDIRS = desktop-links mouse-properties \ -- screensaver-properties background-properties \ -+ background-properties \ - theme-switcher sound-properties \ diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c b/sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c deleted file mode 100644 index ce8170370123..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets::theme-switcher::lister.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- capplets/theme-switcher/lister.c 2002/03/29 12:43:59 1.1 -+++ capplets/theme-switcher/lister.c 2002/03/29 12:45:18 -@@ -115,8 +115,7 @@ - char *errstring = NULL; - int out_fd; - #ifndef HAVE_GETLINE -- char line[1024]; -- char *lineptr = line; -+ char *lineptr = (char *)malloc(1024); - #else - char *lineptr = NULL; - #endif diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c deleted file mode 100644 index 5b48cd25cb94..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/file-types/file-types-icon-entry.c.orig Sun May 5 16:33:51 2002 -+++ capplets/file-types/file-types-icon-entry.c Sun May 5 16:34:02 2002 -@@ -424,7 +424,7 @@ - result = NULL; - filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry)); - if (filename != NULL) { -- path_parts = g_strsplit (filename, "/share/pixmaps/", 0); -+ path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0); - g_free (filename); - - if (path_parts[1] != NULL) { diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c new file mode 100644 index 000000000000..d5ce54f8ce00 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,29 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Sun May 5 01:04:48 2002 ++++ capplets/mouse/gnome-mouse-properties.c Sun May 5 01:05:10 2002 +@@ -532,7 +532,7 @@ + filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { +@@ -553,7 +553,7 @@ + filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { +@@ -574,7 +574,7 @@ + filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnomecontrolcenter2/files/patch-ce b/sysutils/gnomecontrolcenter2/files/patch-ce deleted file mode 100644 index b2186ac89c4c..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-ce +++ /dev/null @@ -1,8 +0,0 @@ ---- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig Wed May 12 02:56:05 1999 -+++ capplets/wm-properties/wm-desktops/WindowMaker.desktop Wed May 12 02:56:22 1999 -@@ -5,4 +5,4 @@ - - [Window Manager] - SessionManaged=false --ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs -+ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index 53566354e4ac..7e44bf49ffc1 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,11 +1,19 @@ ---- configure.orig Sun May 5 16:29:53 2002 -+++ configure Sun May 5 16:30:05 2002 -@@ -9161,7 +9161,7 @@ +--- configure.orig Mon May 6 01:33:23 2002 ++++ configure Mon May 6 01:33:51 2002 +@@ -7353,6 +7353,7 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS - cat >> confdefs.h <>confdefs.h <