Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Feb 2002 12:07:14 +0200 (EET)
From:      Maxim Sobolev <sobomax@FreeBSD.org>
To:        gnome@FreeBSD.org
Subject:   gnomecontrolcenter update [patch for testing]
Message-ID:  <200202051007.g15A7FM55468@vega.vega.com>

next in thread | raw e-mail | index | archive | help

--%--multipart-mixed-boundary-1.55440.1012903634--%
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi folks,

Please test attached patch which updates gnomecc to the latest version.
We need to test it because header file was moved into its own directory,
so that it could break ports that don't respect gnomecc's CFLAGS
returned by gnome-config.

Thanks!

-Maxim

--%--multipart-mixed-boundary-1.55440.1012903634--%
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ASCII English text
Content-Disposition: attachment; filename="gnomecc.diff"

? pkg-plist,v
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnomecontrolcenter/Makefile,v
retrieving revision 1.35
diff -d -u -r1.35 Makefile
--- Makefile	30 Oct 2001 12:41:56 -0000	1.35
+++ Makefile	5 Feb 2002 09:58:04 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.1
+PORTVERSION=	1.4.0.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -20,16 +20,15 @@
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			  `gdk-pixbuf-config --cflags`" \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 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 \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnomecontrolcenter/distinfo,v
retrieving revision 1.13
diff -d -u -r1.13 distinfo
--- distinfo	4 May 2001 21:39:42 -0000	1.13
+++ distinfo	5 Feb 2002 09:58:04 -0000
@@ -1 +1 @@
-MD5 (control-center-1.4.0.1.tar.gz) = 53e3d628a0d53a4b74e1ae8d8cb057ff
+MD5 (control-center-1.4.0.3.tar.gz) = b81b2599dbeb2e5204b8b4cecd455ad1
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnomecontrolcenter/pkg-plist,v
retrieving revision 1.16
diff -d -u -r1.16 pkg-plist
--- pkg-plist	4 May 2001 21:39:42 -0000	1.16
+++ pkg-plist	5 Feb 2002 09:58:04 -0000
@@ -12,7 +12,7 @@
 bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
 etc/cappletConf.sh
-include/capplet-widget.h
+include/libcapplet1/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
 lib/libcapplet.so.5
@@ -50,7 +50,6 @@
 share/gnome/control-center/.data/Coral.desktop
 share/gnome/control-center/.data/Critical.desktop
 share/gnome/control-center/.data/Crystal.desktop
-share/gnome/control-center/.data/crystal.png
 share/gnome/control-center/.data/Cynosure.desktop
 share/gnome/control-center/.data/Decayscreen.desktop
 share/gnome/control-center/.data/Deco.desktop
@@ -143,6 +142,7 @@
 share/gnome/control-center/.data/bsod.png
 share/gnome/control-center/.data/bubbles.png
 share/gnome/control-center/.data/coral.png
+share/gnome/control-center/.data/crystal.png
 share/gnome/control-center/.data/cynosure.png
 share/gnome/control-center/.data/decayscreen.png
 share/gnome/control-center/.data/deco.png
@@ -198,12 +198,9 @@
 share/gnome/control-center/UIOptions/application.desktop
 share/gnome/control-center/UIOptions/dialogs.desktop
 share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/alf.html
-share/gnome/help/control-center/C/authors.html
-share/gnome/help/control-center/C/desktop-intro.html
 share/gnome/help/control-center/C/control-center.sgml
+share/gnome/help/control-center/C/desktop-intro.html
 share/gnome/help/control-center/C/doc-handlers.html
-share/gnome/help/control-center/C/docbook.css
 share/gnome/help/control-center/C/figures/bg-capplet.png
 share/gnome/help/control-center/C/figures/gccalf.png
 share/gnome/help/control-center/C/figures/gccappdef.png
@@ -225,14 +222,8 @@
 share/gnome/help/control-center/C/figures/theme-select.png
 share/gnome/help/control-center/C/figures/wm-add.png
 share/gnome/help/control-center/C/figures/wm-main.png
-share/gnome/help/control-center/C/filetypes.html
-share/gnome/help/control-center/C/gccui.html
 share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/license.html
 share/gnome/help/control-center/C/ln7.html
-share/gnome/help/control-center/C/multimedia-intro.html
-share/gnome/help/control-center/C/peripherals.html
-share/gnome/help/control-center/C/session.html
 share/gnome/help/control-center/C/stylesheet-images/caution.gif
 share/gnome/help/control-center/C/stylesheet-images/home.gif
 share/gnome/help/control-center/C/stylesheet-images/important.gif
@@ -278,6 +269,7 @@
 share/locale/ko/LC_MESSAGES/control-center.mo
 share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
+share/locale/nn/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
@@ -291,7 +283,7 @@
 share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
+share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
 @dirrm share/gnome/omf/control-center
 @dirrm share/gnome/help/control-center/C/stylesheet-images
@@ -314,5 +306,6 @@
 @dirrm share/gnome/apps/Settings/Desktop
 @dirrm share/gnome/apps/Settings
 @dirrm share/gnome/apps
+@dirrm include/libcapplet1
 @dirrm etc/CORBA/servers
 @dirrm etc/CORBA
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in	5 Feb 2002 09:58:04 -0000
@@ -0,0 +1,14 @@
+
+$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)
Index: files/patch-ltmain.sh
===================================================================
RCS file: files/patch-ltmain.sh
diff -N files/patch-ltmain.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-ltmain.sh	5 Feb 2002 09:58:04 -0000
@@ -0,0 +1,45 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Index: files/patch-po::Makefile.in.in
===================================================================
RCS file: files/patch-po::Makefile.in.in
diff -N files/patch-po::Makefile.in.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-po::Makefile.in.in	5 Feb 2002 09:58:04 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2002/02/05 08:03:55	1.1
++++ po/Makefile.in.in	2002/02/05 08:04:08
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \

--%--multipart-mixed-boundary-1.55440.1012903634--%--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202051007.g15A7FM55468>