Date: Fri, 5 Oct 2001 22:34:43 -0700 From: John Merryweather Cooper <john_m_cooper@yahoo.com> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: gnome@FreeBSD.org, ports@FreeBSD.org Subject: Re: GNOME megaupdate [gal/gtkhtml/ORBit/bonobo-conf/librsvg/evolution/sodipodi] - correct patch Message-ID: <20011005223443.A73833@johncoop.MSHOME> In-Reply-To: <3BBDC8E9.AC7372D5@FreeBSD.org>; from sobomax@FreeBSD.org on Fri, Oct 05, 2001 at 07:51:21 -0700 References: <3BBDC1DB.6D718ECA@FreeBSD.org> <3BBDC8E9.AC7372D5@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2001.10.05 07:51 Maxim Sobolev wrote:
> OOPS, sorry I've attached wrong file. Trying again.
>
> -Maxim
>
I've made five passes on getting it all to build so far.
On pass I, oaf failed in the configure stage (I'd deinstalled ORBit
prior to starting the re-build of gnome-fifth-toe). ORBit got built
a little further down in the build, so . . .
On pass II, I used portupgrade -fr oaf. oaf, gconf, and gnome-print
(plus some other stuff) got built. Build of bonobo fails toward the
end when it can't find libgnomeprint/gnome-print.h. So, on to pass III
. .
On pass III, I used portupgrade -fr bonobo. Bonobo fails in the same
manner as previously described. So, on to pass IV . . .
On pass IV, I used portupgrade -fr gnomeprint. gnomeprint rebuilt fine,
but Bonobo remains broken. Oh, well; I'll try one more time . . .
On pass V, I used portupgrade -fr bonobo again. Samo, samo.
--
jmc
MacroHard -- the perfection of form over
substance, marketing over
performance, and greed over
design . . .
P.S. Now might be a good time to add portupgrade to one or both GNOME
mega-meta-ports. Although the last megaupdate built fine, changes to
the ABI numbers for GAL and gtkhtml required rebuild Balsa, etc.
portupgrade makes this so much simpler. :)
==========================================================================
> Maxim Sobolev wrote:
>
> > Hi Gnome'rs!
> >
> > Attached please find a patch that updates five core GNOME
> > components and two applications included into GNOME metaport
> > to the latest versions. Please test this patch and report
> > any problems. If there are no serious problems I'm planning
> > to commit it at the very beginning of the next week.
> >
> > As usually following is the correct procedure to test the
> > patchset:
> >
> > 1. Remove old ORBit and all ports that depend on it:
> >
> > # pkg_delete `cat /var/db/pkg/ORBit-*/+REQUIRED_BY`;
> > pkg_delete ORBit*
> > (users of -current and very recent -stable can use
> > "pkg_delete -r ORBit*" instead)
> >
> > 2. Patch your /usr/ports tree;
> >
> > # cd /usr/ports ; patch -p1 -s <
> > /where/you/put/it/gnomeupdate.diff
> >
> > 3. Run build either of full GNOME metaport:
> >
> > # cd /usr/ports/x11/gnome-fifth-toe ; make clean ; make
> > install clean
> >
> > or core GNOME components:
> >
> > # cd /usr/ports/x11/gnome ; make clean ; make install clean
> >
> > 4. Test it and report back any unusual problems.
> >
> > Thanks!
> >
> > -Maxim
>
> Index: ports/x11-toolkits/gal/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/x11-toolkits/gal/Makefile,v
> retrieving revision 1.22
> diff -d -u -r1.22 Makefile
> --- ports/x11-toolkits/gal/Makefile 2001/10/01
> 06:38:06 1.22
> +++ ports/x11-toolkits/gal/Makefile 2001/10/05 13:28:26
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= gal
> -PORTVERSION= 0.12
> +PORTVERSION= 0.13
> CATEGORIES?= x11-toolkits gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= unstable/sources/gal
> Index: ports/x11-toolkits/gal/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/x11-toolkits/gal/distinfo,v
> retrieving revision 1.16
> diff -d -u -r1.16 distinfo
> --- ports/x11-toolkits/gal/distinfo 2001/10/01
> 06:38:06 1.16
> +++ ports/x11-toolkits/gal/distinfo 2001/10/05 13:28:26
> @@ -1 +1 @@
> -MD5 (gal-0.12.tar.gz) = c6ff4cbf9bb98dc79460898d41dece40
> +MD5 (gal-0.13.tar.gz) = 569f19c943c1a586d71706d49312fdea
> Index: ports/x11-toolkits/gal/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/x11-toolkits/gal/pkg-plist,v
> retrieving revision 1.13
> diff -d -u -r1.13 pkg-plist
> --- ports/x11-toolkits/gal/pkg-plist 2001/10/01
> 06:38:06 1.13
> +++ ports/x11-toolkits/gal/pkg-plist 2001/10/05 13:28:27
> @@ -128,7 +128,7 @@
> include/gal/widgets/widget-pixmap-combo.h
> lib/libgal.a
> lib/libgal.so
> -lib/libgal.so.12
> +lib/libgal.so.13
> share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
> share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
> share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
> Index: ports/devel/bonobo-conf/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/devel/bonobo-conf/Makefile,v
> retrieving revision 1.8
> diff -d -u -r1.8 Makefile
> --- ports/devel/bonobo-conf/Makefile 2001/08/16
> 13:12:47 1.8
> +++ ports/devel/bonobo-conf/Makefile 2001/10/05 13:28:27
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= bonobo-conf
> -PORTVERSION= 0.11
> +PORTVERSION= 0.12
> CATEGORIES= devel gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= unstable/sources/bonobo-conf
> Index: ports/devel/bonobo-conf/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/devel/bonobo-conf/distinfo,v
> retrieving revision 1.6
> diff -d -u -r1.6 distinfo
> --- ports/devel/bonobo-conf/distinfo 2001/08/16
> 13:12:47 1.6
> +++ ports/devel/bonobo-conf/distinfo 2001/10/05 13:28:27
> @@ -1 +1 @@
> -MD5 (bonobo-conf-0.11.tar.gz) = ed574259ee3f5222bc3dacc3b7da7256
> +MD5 (bonobo-conf-0.12.tar.gz) = 713c4566fb09a628ab342ec5dfefe1bf
> Index: ports/devel/bonobo-conf/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/devel/bonobo-conf/pkg-plist,v
> retrieving revision 1.6
> diff -d -u -r1.6 pkg-plist
> --- ports/devel/bonobo-conf/pkg-plist 2001/08/16
> 13:12:47 1.6
> +++ ports/devel/bonobo-conf/pkg-plist 2001/10/05 13:28:27
> @@ -21,14 +21,17 @@
> share/gnome/oaf/Bonobo_Moniker_config.oaf
> share/gnome/oaf/Bonobo_Moniker_gconf.oaf
> share/gnome/oaf/Bonobo_Moniker_xmldb.oaf
> +share/locale/da/LC_MESSAGES/bonobo-conf.mo
> share/locale/de/LC_MESSAGES/bonobo-conf.mo
> share/locale/es/LC_MESSAGES/bonobo-conf.mo
> +share/locale/fr/LC_MESSAGES/bonobo-conf.mo
> share/locale/it/LC_MESSAGES/bonobo-conf.mo
> share/locale/nn/LC_MESSAGES/bonobo-conf.mo
> share/locale/no/LC_MESSAGES/bonobo-conf.mo
> share/locale/pl/LC_MESSAGES/bonobo-conf.mo
> share/locale/sv/LC_MESSAGES/bonobo-conf.mo
> -share/locale/zh_TW.Big5/LC_MESSAGES/bonobo-conf.mo
> +share/locale/tr/LC_MESSAGES/bonobo-conf.mo
> +share/locale/zh_TW/LC_MESSAGES/bonobo-conf.mo
> @dirrm share/gnome/bonobo-conf/html/bonobo-conf
> @dirrm share/gnome/bonobo-conf/html
> @dirrm share/gnome/bonobo-conf
> Index: ports/www/gtkhtml/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/www/gtkhtml/Makefile,v
> retrieving revision 1.34
> diff -d -u -r1.34 Makefile
> --- ports/www/gtkhtml/Makefile 2001/10/01 06:38:40 1.34
> +++ ports/www/gtkhtml/Makefile 2001/10/05 13:28:27
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= gtkhtml
> -PORTVERSION= 0.13.0
> +PORTVERSION= 0.14.0
> CATEGORIES= www gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
> @@ -15,7 +15,7 @@
>
> LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \
> pspell.4:${PORTSDIR}/textproc/pspell \
> - gal.12:${PORTSDIR}/x11-toolkits/gal \
> + gal.13:${PORTSDIR}/x11-toolkits/gal \
> ghttp.1:${PORTSDIR}/www/libghttp
>
> USE_X_PREFIX= yes
> Index: ports/www/gtkhtml/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/www/gtkhtml/distinfo,v
> retrieving revision 1.12
> diff -d -u -r1.12 distinfo
> --- ports/www/gtkhtml/distinfo 2001/10/01 06:38:40 1.12
> +++ ports/www/gtkhtml/distinfo 2001/10/05 13:28:27
> @@ -1 +1 @@
> -MD5 (gtkhtml-0.13.0.tar.gz) = 259de4e0301095e9b31602e5f74a5be1
> +MD5 (gtkhtml-0.14.0.tar.gz) = 2c8cee524f37fd34e41a0456654ba9a3
> Index: ports/www/gtkhtml/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/www/gtkhtml/pkg-plist,v
> retrieving revision 1.14
> diff -d -u -r1.14 pkg-plist
> --- ports/www/gtkhtml/pkg-plist 2001/10/01 06:38:40 1.14
> +++ ports/www/gtkhtml/pkg-plist 2001/10/05 13:28:27
> @@ -93,7 +93,7 @@
> lib/bonobo/plugin/libstorage_http.so
> lib/libgtkhtml.a
> lib/libgtkhtml.so
> -lib/libgtkhtml.so.16
> +lib/libgtkhtml.so.17
> share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
> share/gnome/control-center/Documents/gtkhtml-properties.desktop
> share/gnome/control-center/capplets/gtkhtml-properties.desktop
> Index: ports/mail/evolution/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/mail/evolution/Makefile,v
> retrieving revision 1.34
> diff -d -u -r1.34 Makefile
> --- ports/mail/evolution/Makefile 2001/10/01
> 06:40:03 1.34
> +++ ports/mail/evolution/Makefile 2001/10/05 13:28:27
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= evolution
> -PORTVERSION= 0.14
> +PORTVERSION= 0.15
> CATEGORIES= mail gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= unstable/sources/evolution
> @@ -39,7 +39,7 @@
> 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
> s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
> @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l
> '[^g]iconv.h' | \
> - xargs ${PERL} -pi -e 's|([^g])iconv.h|\1giconv.h|g'
> + xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g'
> @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l
> '<db.h>' | \
> xargs ${PERL} -pi -e 's|<db.h>|<db3/db.h>|g'
> @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l
> 'wrong DB3' | \
> Index: ports/mail/evolution/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/mail/evolution/distinfo,v
> retrieving revision 1.13
> diff -d -u -r1.13 distinfo
> --- ports/mail/evolution/distinfo 2001/10/01
> 06:40:03 1.13
> +++ ports/mail/evolution/distinfo 2001/10/05 13:28:27
> @@ -1 +1 @@
> -MD5 (evolution-0.14.tar.gz) = 706453bd2271f2b0073cd30188e1a33d
> +MD5 (evolution-0.15.tar.gz) = 3297446afe4b4a4615b3ca130e1bd3af
> Index: ports/mail/evolution/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/mail/evolution/pkg-plist,v
> retrieving revision 1.14
> diff -d -u -r1.14 pkg-plist
> --- ports/mail/evolution/pkg-plist 2001/10/01
> 06:40:03 1.14
> +++ ports/mail/evolution/pkg-plist 2001/10/05 13:28:27
> @@ -699,6 +699,7 @@
> share/gnome/images/evolution/show_all_messages.xpm
> share/gnome/images/evolution/splash.png
> share/gnome/images/evolution/talking-heads.png
> +share/gnome/images/evolution/task.png
> share/gnome/images/evolution/task.xpm
> share/gnome/images/evolution/thankyou.png
> share/gnome/images/evolution/timezone-16.xpm
> Index: ports/x11/gnomecore/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/x11/gnomecore/Makefile,v
> retrieving revision 1.66
> diff -d -u -r1.66 Makefile
> --- ports/x11/gnomecore/Makefile 2001/10/01
> 06:40:47 1.66
> +++ ports/x11/gnomecore/Makefile 2001/10/05 13:28:27
> @@ -15,7 +15,7 @@
>
> MAINTAINER?= gnome@FreeBSD.org
>
> -LIB_DEPENDS= gtkhtml.16:${PORTSDIR}/www/gtkhtml
> +LIB_DEPENDS= gtkhtml.17:${PORTSDIR}/www/gtkhtml
> RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
>
> USE_X_PREFIX= yes
> Index: ports/devel/ORBit/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/devel/ORBit/Makefile,v
> retrieving revision 1.46
> diff -d -u -r1.46 Makefile
> --- ports/devel/ORBit/Makefile 2001/05/23 00:48:53 1.46
> +++ ports/devel/ORBit/Makefile 2001/10/05 13:28:27
> @@ -6,8 +6,7 @@
> #
>
> PORTNAME= ORBit
> -PORTVERSION= 0.5.8
> -PORTREVISION= 1
> +PORTVERSION= 0.5.10
> CATEGORIES= devel gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= stable/sources/ORBit
> @@ -20,9 +19,8 @@
>
> USE_GMAKE= yes
> USE_GLIB= yes
> -USE_LIBTOOL= yes
> INSTALLS_SHLIB= yes
> -LIBTOOLFILES= configure libIDL/configure popt/configure
> +GNU_CONFIGURE= yes
> CONFIGURE_ARGS= --disable-indent
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LIBS="-L${LOCALBASE}/lib"
> @@ -33,5 +31,15 @@
> @if [ ! -f ${PREFIX}/etc/orbitrc ]; then \
> ${CP} -p ${PREFIX}/etc/orbitrc.default
> ${PREFIX}/etc/orbitrc ; \
> fi
> +.for dir in IIOP ORBitservices ORBitutil orb orbit-idl2.h
> + @if [ -L ${PREFIX}/include/${dir} ]; then \
> + ${RM} -f ${PREFIX}/include/${dir}; \
> + fi
> + @${LN} -sf ${PREFIX}/include/orbit-1.0/${dir}
> ${PREFIX}/include/${dir}
> +.endfor
> + @if [ -L ${PREFIX}/include/libIDL ]; then \
> + ${RM} -f ${PREFIX}/include/libIDL; \
> + fi
> + @${LN} -sf ${PREFIX}/include/libIDL-1.0/libIDL
> ${PREFIX}/include/libIDL
>
> .include <bsd.port.mk>
> Index: ports/devel/ORBit/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/devel/ORBit/distinfo,v
> retrieving revision 1.19
> diff -d -u -r1.19 distinfo
> --- ports/devel/ORBit/distinfo 2001/05/14 21:57:45 1.19
> +++ ports/devel/ORBit/distinfo 2001/10/05 13:28:27
> @@ -1 +1 @@
> -MD5 (ORBit-0.5.8.tar.gz) = 602b23db8666274caf6cf87b7857d4a3
> +MD5 (ORBit-0.5.10.tar.gz) = 84e818d9f6fa4f389b9ea82aa00e8f6c
> Index: ports/devel/ORBit/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/devel/ORBit/pkg-plist,v
> retrieving revision 1.12
> diff -d -u -r1.12 pkg-plist
> --- ports/devel/ORBit/pkg-plist 2001/05/23 00:48:53 1.12
> +++ ports/devel/ORBit/pkg-plist 2001/10/05 13:28:27
> @@ -10,68 +10,74 @@
> @unexec if cmp -s %D/etc/orbitrc.default %D/etc/orbitrc; then rm -f
> %D/etc/orbitrc; fi
> etc/orbitrc.default
> @exec if [ ! -f %D/etc/orbitrc ] ; then cp -p %D/%F %B/orbitrc; fi
> -include/IIOP/IIOP-config.h
> -include/IIOP/IIOP-types.h
> -include/IIOP/IIOP.h
> -include/IIOP/giop-msg-buffer.h
> -include/IIOP/iiop-encoders.h
> -include/IIOP/iiop-endian.h
> -include/ORBitservices/CosEventChannel.idl
> -include/ORBitservices/CosEventComm.idl
> -include/ORBitservices/CosNaming.h
> -include/ORBitservices/CosNaming.idl
> -include/ORBitservices/CosNaming_impl.h
> -include/ORBitservices/CosTypedEventChannel.idl
> -include/ORBitservices/CosTypedEventComm.idl
> -include/ORBitservices/LName.pidl
> -include/ORBitutil/basic_types.h
> -include/ORBitutil/compat.h
> -include/ORBitutil/orbit-os-config.h
> -include/ORBitutil/os-feature-alloca.h
> -include/ORBitutil/os-specifics.h
> -include/ORBitutil/thread-safety.h
> -include/ORBitutil/trace.h
> -include/ORBitutil/util.h
> -include/libIDL/IDL.h
> -include/orb/allocator-defs.h
> -include/orb/allocators.h
> -include/orb/cdr.h
> -include/orb/corba_any.h
> -include/orb/corba_any_proto.h
> -include/orb/corba_any_type.h
> -include/orb/corba_basic_sequences_type.h
> -include/orb/corba_context.h
> -include/orb/corba_env.h
> -include/orb/corba_env_type.h
> -include/orb/corba_object.h
> -include/orb/corba_object_type.h
> -include/orb/corba_orb.h
> -include/orb/corba_orb_type.h
> -include/orb/corba_portableserver.h
> -include/orb/corba_portableserver_type.h
> -include/orb/corba_sequences.h
> -include/orb/corba_sequences_type.h
> -include/orb/corba_typecode.h
> -include/orb/corba_typecode_type.h
> -include/orb/dii.h
> -include/orb/dynany.h
> -include/orb/env.h
> -include/orb/interface_repository.h
> -include/orb/iop.h
> -include/orb/ir.h
> -include/orb/options.h
> -include/orb/orb.h
> -include/orb/orbit.h
> -include/orb/orbit_config.h
> -include/orb/orbit_object.h
> -include/orb/orbit_object_type.h
> -include/orb/orbit_poa.h
> -include/orb/orbit_poa_type.h
> -include/orb/orbit_typecode.h
> -include/orb/orbit_types.h
> -include/orb/poa.h
> -include/orb/sequences.h
> -include/orb/typecode.h
> +include/IIOP
> +include/ORBitservices
> +include/ORBitutil
> +include/libIDL
> +include/libIDL-1.0/libIDL/IDL.h
> +include/orb
> +include/orbit-1.0/IIOP/IIOP-config.h
> +include/orbit-1.0/IIOP/IIOP-types.h
> +include/orbit-1.0/IIOP/IIOP.h
> +include/orbit-1.0/IIOP/giop-msg-buffer.h
> +include/orbit-1.0/IIOP/iiop-encoders.h
> +include/orbit-1.0/IIOP/iiop-endian.h
> +include/orbit-1.0/ORBitservices/CosEventChannel.idl
> +include/orbit-1.0/ORBitservices/CosEventComm.idl
> +include/orbit-1.0/ORBitservices/CosNaming.h
> +include/orbit-1.0/ORBitservices/CosNaming.idl
> +include/orbit-1.0/ORBitservices/CosNaming_impl.h
> +include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl
> +include/orbit-1.0/ORBitservices/CosTypedEventComm.idl
> +include/orbit-1.0/ORBitservices/LName.pidl
> +include/orbit-1.0/ORBitutil/basic_types.h
> +include/orbit-1.0/ORBitutil/compat.h
> +include/orbit-1.0/ORBitutil/orbit-os-config.h
> +include/orbit-1.0/ORBitutil/os-feature-alloca.h
> +include/orbit-1.0/ORBitutil/os-specifics.h
> +include/orbit-1.0/ORBitutil/thread-safety.h
> +include/orbit-1.0/ORBitutil/trace.h
> +include/orbit-1.0/ORBitutil/util.h
> +include/orbit-1.0/orb/allocator-defs.h
> +include/orbit-1.0/orb/allocators.h
> +include/orbit-1.0/orb/cdr.h
> +include/orbit-1.0/orb/corba_any.h
> +include/orbit-1.0/orb/corba_any_proto.h
> +include/orbit-1.0/orb/corba_any_type.h
> +include/orbit-1.0/orb/corba_basic_sequences_type.h
> +include/orbit-1.0/orb/corba_context.h
> +include/orbit-1.0/orb/corba_env.h
> +include/orbit-1.0/orb/corba_env_type.h
> +include/orbit-1.0/orb/corba_object.h
> +include/orbit-1.0/orb/corba_object_type.h
> +include/orbit-1.0/orb/corba_orb.h
> +include/orbit-1.0/orb/corba_orb_type.h
> +include/orbit-1.0/orb/corba_portableserver.h
> +include/orbit-1.0/orb/corba_portableserver_type.h
> +include/orbit-1.0/orb/corba_sequences.h
> +include/orbit-1.0/orb/corba_sequences_type.h
> +include/orbit-1.0/orb/corba_typecode.h
> +include/orbit-1.0/orb/corba_typecode_type.h
> +include/orbit-1.0/orb/dii.h
> +include/orbit-1.0/orb/dynany.h
> +include/orbit-1.0/orb/env.h
> +include/orbit-1.0/orb/interface_repository.h
> +include/orbit-1.0/orb/iop.h
> +include/orbit-1.0/orb/ir.h
> +include/orbit-1.0/orb/options.h
> +include/orbit-1.0/orb/orb.h
> +include/orbit-1.0/orb/orbit.h
> +include/orbit-1.0/orb/orbit_config.h
> +include/orbit-1.0/orb/orbit_object.h
> +include/orbit-1.0/orb/orbit_object_type.h
> +include/orbit-1.0/orb/orbit_poa.h
> +include/orbit-1.0/orb/orbit_poa_type.h
> +include/orbit-1.0/orb/orbit_typecode.h
> +include/orbit-1.0/orb/orbit_types.h
> +include/orbit-1.0/orb/poa.h
> +include/orbit-1.0/orb/sequences.h
> +include/orbit-1.0/orb/typecode.h
> +include/orbit-1.0/orbit-idl2.h
> include/orbit-idl2.h
> @unexec install-info --delete %D/info/libIDL.info %D/info/dir
> info/libIDL.info
> @@ -97,8 +103,10 @@
> libdata/pkgconfig/libIDL.pc
> share/aclocal/ORBit.m4
> share/aclocal/libIDL.m4
> -@dirrm include/IIOP
> -@dirrm include/ORBitservices
> -@dirrm include/ORBitutil
> -@dirrm include/libIDL
> -@dirrm include/orb
> +@dirrm include/orbit-1.0/orb
> +@dirrm include/orbit-1.0/ORBitutil
> +@dirrm include/orbit-1.0/ORBitservices
> +@dirrm include/orbit-1.0/IIOP
> +@dirrm include/orbit-1.0
> +@dirrm include/libIDL-1.0/libIDL
> +@dirrm include/libIDL-1.0
> Index: ports/devel/ORBit/files/patch-ac
> ===================================================================
> RCS file: /home/ncvs/ports/devel/ORBit/files/patch-ac,v
> retrieving revision 1.15
> diff -d -u -r1.15 patch-ac
> --- ports/devel/ORBit/files/patch-ac 2001/05/23
> 00:48:56 1.15
> +++ ports/devel/ORBit/files/patch-ac 2001/10/05 13:28:27
> @@ -20,18 +20,6 @@
> mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
> CONFIG_HEADER = ../../config.h
> CONFIG_CLEAN_FILES =
> ---- src/orb/Makefile.in.orig Tue Jan 30 14:56:07 2001
> -+++ src/orb/Makefile.in Thu Mar 8 11:16:44 2001
> -@@ -113,3 +113,3 @@
> -
> --libORBit_la_LDFLAGS = -version-info
> $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
> -+libORBit_la_LDFLAGS = -version-info 2:0:0
> - libORBit_la_LIBADD = $(GLIB_LIBS) -lm
> -@@ -121,3 +121,3 @@
> -
> --CFLAGS = -g -O0
> -+CFLAGS = @CFLAGS@
> - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
> --- src/services/name/Makefile.in.orig Thu Oct 12 11:07:08
> 2000
> +++ src/services/name/Makefile.in Thu Oct 12 13:11:55 2000
> @@ -109,3 +109,3 @@
> Index: ports/devel/ORBit/files/patch-ad
> ===================================================================
> RCS file: /home/ncvs/ports/devel/ORBit/files/patch-ad,v
> retrieving revision 1.4
> diff -d -u -r1.4 patch-ad
> --- ports/devel/ORBit/files/patch-ad 2000/02/23
> 01:03:15 1.4
> +++ ports/devel/ORBit/files/patch-ad 2001/10/05 13:28:27
> @@ -1,5 +1,8 @@
> ---- orbit-config.in.orig Thu Oct 7 23:49:07 1999
> -+++ orbit-config.in Tue Feb 22 18:20:47 2000
> +
> +$FreeBSD$
> +
> +--- orbit-config.in.orig Wed Sep 19 20:09:00 2001
> ++++ orbit-config.in Wed Oct 3 14:51:10 2001
> @@ -28,8 +28,8 @@
>
> Known values for TARGET are:
> @@ -16,24 +19,9 @@
>
> client|server)
> - the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil
> `glib-config --libs` @LIBS@ -lm"
> -- the_flags="$the_flags `glib-config --cflags` -I$includedir "
> -+ the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil
> `@GLIB_CONFIG@ --libs` @LIBS@ -lm"
> -+ the_flags="$the_flags `@GLIB_CONFIG@ --cflags` -I$includedir
> "
> +- the_flags="$the_flags `glib-config --cflags` "
> ++ the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil
> `@GLIB_CONFIG@ --libs` @LIBS@ @LIB_WRAP@ -lm"
> ++ the_flags="$the_flags `@GLIB_CONFIG@ --cflags` "
> + test "x$includedir" = "x/usr/include" \
> + || the_flags="$the_flags -I$includedir "
> ;;
> -
> - --use-service=*)
> ---- libIDL/libIDL-config.in.orig Fri Apr 16 09:52:20 1999
> -+++ libIDL/libIDL-config.in Wed Oct 13 20:49:40 1999
> -@@ -74,10 +74,10 @@
> - echo $exec_prefix
> - fi
> - if test "$echo_cflags" = "yes"; then
> -- all_flags="$all_flags $includes $cflags `glib-config
> --cflags`"
> -+ all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@
> --cflags`"
> - fi
> - if test "$echo_libs" = "yes"; then
> -- all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`"
> -+ all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@
> --libs`"
> - fi
> -
> - # Straight out any possible duplicates, but be careful to
> Index: ports/devel/ORBit/files/patch-libIDL::ltmain.sh
> ===================================================================
> RCS file: patch-libIDL::ltmain.sh
> diff -N patch-libIDL::ltmain.sh
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-libIDL::ltmain.sh Fri Oct 5 06:28:27 2001
> @@ -0,0 +1,18 @@
> +
> +$FreeBSD$
> +
> +--- libIDL/ltmain.sh.orig Wed Oct 3 10:03:39 2001
> ++++ libIDL/ltmain.sh Wed Oct 3 15:05:20 2001
> +@@ -4175,10 +4175,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: ports/devel/ORBit/files/patch-ltmain.sh
> ===================================================================
> RCS file: patch-ltmain.sh
> diff -N patch-ltmain.sh
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-ltmain.sh Fri Oct 5 06:28:27 2001
> @@ -0,0 +1,18 @@
> +
> +$FreeBSD$
> +
> +--- ltmain.sh 2001/08/27 09:51:26 1.1
> ++++ ltmain.sh 2001/08/27 09:51:42
> +@@ -4175,10 +4175,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: ports/devel/ORBit/files/patch-popt::ltmain.sh
> ===================================================================
> RCS file: patch-popt::ltmain.sh
> diff -N patch-popt::ltmain.sh
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-popt::ltmain.sh Fri Oct 5 06:28:27 2001
> @@ -0,0 +1,18 @@
> +
> +$FreeBSD$
> +
> +--- popt/ltmain.sh.orig Wed Oct 3 10:03:41 2001
> ++++ popt/ltmain.sh Wed Oct 3 15:01:07 2001
> +@@ -4175,10 +4175,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: ports/devel/ORBit/files/patch-src::IIOP::connection.c
> ===================================================================
> RCS file: patch-src::IIOP::connection.c
> diff -N patch-src::IIOP::connection.c
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-src::IIOP::connection.c Fri Oct 5 06:28:27 2001
> @@ -0,0 +1,65 @@
> +$NetBSD: patch-ag,v 1.6 2001/05/21 19:59:04 rh Exp $
> +
> +--- src/IIOP/connection.c.orig Sun May 13 09:07:46 2001
> ++++ src/IIOP/connection.c
> +@@ -1,4 +1,7 @@
> + #include "config.h"
> ++#include <sys/types.h>
> ++#include <sys/param.h>
> ++#include <stdio.h>
> + #if defined (__hpux) && ! defined (_XOPEN_SOURCE_EXTENDED)
> + # define _XOPEN_SOURCE_EXTENDED 1
> + # define WE_DEFINED_XOPEN_SOURCE_EXTENDED 1
> +@@ -13,7 +16,6 @@
> + #include <stdlib.h>
> + #include <unistd.h>
> + #include <errno.h>
> +-#include <sys/types.h>
> + #include <fcntl.h>
> + #include <sys/socket.h>
> + #include <sys/un.h>
> +@@ -32,7 +34,7 @@
> + #include <signal.h>
> + #include <syslog.h>
> +
> +-#if defined(HAVE_TCPD_H) && defined(HAVE_HOSTS_ACCESS)
> ++#if defined(HAVE_TCPD_H)
> + #include <tcpd.h>
> + #endif
> +
> +@@ -80,7 +82,7 @@
> + GIOPConnectionList giop_connection_list;
> + static GSList *iiop_unix_socket_list = NULL;
> +
> +-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H)
> ++#if defined (HAVE_TCPD_H)
> + static const char *argv0_val = NULL;
> + #endif
> +
> +@@ -104,7 +106,7 @@
> + struct sigaction mypipe;
> + g_assert(sizeof(GIOPMessageHeader) == 12);
> +
> +-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H)
> ++#if defined (HAVE_TCPD_H)
> + argv0_val = g_strdup(g_basename(argv0)); /* For TCP wrappers */
> + #endif
> +
> +@@ -1007,7 +1009,7 @@
> + */
> + int allow_severity = LOG_INFO, deny_severity = LOG_NOTICE;
> +
> +-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H)
> ++#if defined(HAVE_TCPD_H)
> + DEFINE_LOCK(tcp_wrappers_usage);
> +
> + #endif
> +@@ -1033,7 +1035,7 @@
> +
> + newfd = accept(GIOP_CONNECTION_GET_FD(connection), &sock, &n);
> +
> +-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H)
> ++#if defined(HAVE_TCPD_H)
> + /* tcp wrappers access checking */
> + switch(IIOP_CONNECTION(connection)->icnxtype) {
> + case IIOP_IPV4:
> Index: ports/devel/ORBit/files/patch-src::daemons::interface_repository::Makefile.in
> ===================================================================
> RCS file: patch-src::daemons::interface_repository::Makefile.in
> diff -N patch-src::daemons::interface_repository::Makefile.in
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-src::daemons::interface_repository::Makefile.in Fri
> Oct 5 06:28:27 2001
> @@ -0,0 +1,13 @@
> +$NetBSD: patch-al,v 1.5 2000/10/17 23:48:01 jlam Exp $
> +
> +--- src/daemons/interface_repository/Makefile.in.orig Thu Oct
> 12 12:07:12 2000
> ++++ src/daemons/interface_repository/Makefile.in
> +@@ -102,7 +102,7 @@
> +
> +
> + orbit_ird_LDFLAGS = -static
> +-orbit_ird_LDADD = $(top_builddir)/src/orb/libORBit.la
> $(top_builddir)/src/IIOP/libIIOP.la
> $(top_builddir)/src/ORBitutil/libORBitutil.la
@GLIB_LIBS@
> -lm
> ++orbit_ird_LDADD = $(top_builddir)/src/orb/libORBit.la
> $(top_builddir)/src/IIOP/libIIOP.la
> $(top_builddir)/src/ORBitutil/libORBitutil.la
@GLIB_LIBS@
> -lm @LIB_WRAP@
> +
> +
> + orbit_ird_SOURCES = interface_repository-skels.c
> interface_repository-impl.c
> Index: ports/devel/ORBit/files/patch-src::orb::Makefile.in
> ===================================================================
> RCS file: patch-src::orb::Makefile.in
> diff -N patch-src::orb::Makefile.in
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-src::orb::Makefile.in Fri Oct 5 06:28:27 2001
> @@ -0,0 +1,14 @@
> +
> +$FreeBSD$
> +
> +--- src/orb/Makefile.in.orig Wed Oct 3 10:21:01 2001
> ++++ src/orb/Makefile.in Wed Oct 3 14:43:17 2001
> +@@ -115,7 +115,7 @@
> + IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
> + IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
> +
> +-libORBit_la_LDFLAGS = -version-info
> $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
> ++libORBit_la_LDFLAGS = -version-info 2:0:0
> + libORBit_la_LIBADD = $(GLIB_LIBS) -lm
> +
> + BUILT_SOURCES = orbit.h interface_repository.h
> interface_repository-common.c interface_repository-stubs.c
> Index: ports/devel/ORBit/files/patch-src::services::event::Makefile.in
> ===================================================================
> RCS file: patch-src::services::event::Makefile.in
> diff -N patch-src::services::event::Makefile.in
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-src::services::event::Makefile.in Fri Oct 5 06:28:27
> 2001
> @@ -0,0 +1,13 @@
> +$NetBSD: patch-am,v 1.3 2000/10/17 23:48:01 jlam Exp $
> +
> +--- src/services/event/Makefile.in.orig Thu Oct 12 12:07:09
> 2000
> ++++ src/services/event/Makefile.in
> +@@ -115,7 +115,7 @@
> + DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(top_builddir)/src/IIOP/libIIOP.la
> +
> +
> +-LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@
> -lm
> ++LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@
> -lm @LIB_WRAP@
> +
> +
> + event_consumer_SOURCES = event-consumer.c CosEventComm-skels.c
> CosEventChannel-common.c CosEventChannel-stubs.c
> Index: ports/devel/ORBit/files/patch-src::services::name::Makefile.in
> ===================================================================
> RCS file: patch-src::services::name::Makefile.in
> diff -N patch-src::services::name::Makefile.in
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-src::services::name::Makefile.in Fri Oct 5 06:28:27
> 2001
> @@ -0,0 +1,13 @@
> +$NetBSD: patch-ae,v 1.8 2000/10/17 23:48:01 jlam Exp $
> +
> +--- src/services/name/Makefile.in.orig Thu Oct 12 12:07:08
> 2000
> ++++ src/services/name/Makefile.in
> +@@ -123,7 +123,7 @@
> + DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la
> $(top_builddir)/src/IIOP/libIIOP.la libORBitCosNaming.la
> +
> +
> +-LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la
> libORBitCosNaming.la @GLIB_LIBS@
> -lm
> ++LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la
> libORBitCosNaming.la @GLIB_LIBS@
> -lm @LIB_WRAP@
> +
> +
> + #name-client.c boot.c orbit-name-server.c new-name-server.c:
> CosNaming.h
> Index: ports/print/gnomeprint/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/print/gnomeprint/Makefile,v
> retrieving revision 1.33
> diff -d -u -r1.33 Makefile
> --- ports/print/gnomeprint/Makefile 2001/09/11
> 21:23:46 1.33
> +++ ports/print/gnomeprint/Makefile 2001/10/05 13:28:29
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= gnomeprint
> -PORTVERSION= 0.29
> +PORTVERSION= 0.30
> CATEGORIES= print gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= stable/sources/gnome-print
> @@ -22,15 +22,15 @@
> USE_GMAKE= yes
> USE_PERL5= yes
> USE_GNOMECTRL= yes
> -USE_LIBTOOL= yes
> INSTALLS_SHLIB= yes
> +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: ports/print/gnomeprint/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/print/gnomeprint/distinfo,v
> retrieving revision 1.14
> diff -d -u -r1.14 distinfo
> --- ports/print/gnomeprint/distinfo 2001/06/05
> 04:58:33 1.14
> +++ ports/print/gnomeprint/distinfo 2001/10/05 13:28:29
> @@ -1 +1 @@
> -MD5 (gnome-print-0.29.tar.gz) = 3b28ad04f1137b7e475396410597a1eb
> +MD5 (gnome-print-0.30.tar.gz) = 4a3c0dff05f649d59616c7652d149759
> Index: ports/print/gnomeprint/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/print/gnomeprint/pkg-plist,v
> retrieving revision 1.15
> diff -d -u -r1.15 pkg-plist
> --- ports/print/gnomeprint/pkg-plist 2001/06/05
> 04:58:33 1.15
> +++ ports/print/gnomeprint/pkg-plist 2001/10/05 13:28:29
> @@ -1,30 +1,32 @@
> bin/gnome-font-install
> +etc/gnome/fonts/gnome-print-ghostscript.fontmap
> etc/printConf.sh
> -include/libgnomeprint/gnome-font-dialog.h
> -include/libgnomeprint/gnome-font-face.h
> -include/libgnomeprint/gnome-font.h
> -include/libgnomeprint/gnome-glyphlist.h
> -include/libgnomeprint/gnome-pgl.h
> -include/libgnomeprint/gnome-print-copies.h
> -include/libgnomeprint/gnome-print-dialog.h
> -include/libgnomeprint/gnome-print-encode.h
> -include/libgnomeprint/gnome-print-frgba.h
> -include/libgnomeprint/gnome-print-master-preview.h
> -include/libgnomeprint/gnome-print-master.h
> -include/libgnomeprint/gnome-print-meta.h
> -include/libgnomeprint/gnome-print-multipage.h
> -include/libgnomeprint/gnome-print-pdf.h
> -include/libgnomeprint/gnome-print-pixbuf.h
> -include/libgnomeprint/gnome-print-preview.h
> -include/libgnomeprint/gnome-print-rbuf.h
> -include/libgnomeprint/gnome-print.h
> -include/libgnomeprint/gnome-printer-dialog.h
> -include/libgnomeprint/gnome-printer.h
> -include/libgnomeprint/gnome-rfont.h
> -include/libgnomeprint/gnome-text.h
> +include/gnome-1.0/libgnomeprint/gnome-font-dialog.h
> +include/gnome-1.0/libgnomeprint/gnome-font-face.h
> +include/gnome-1.0/libgnomeprint/gnome-font.h
> +include/gnome-1.0/libgnomeprint/gnome-glyphlist.h
> +include/gnome-1.0/libgnomeprint/gnome-pgl.h
> +include/gnome-1.0/libgnomeprint/gnome-print-copies.h
> +include/gnome-1.0/libgnomeprint/gnome-print-dialog.h
> +include/gnome-1.0/libgnomeprint/gnome-print-encode.h
> +include/gnome-1.0/libgnomeprint/gnome-print-frgba.h
> +include/gnome-1.0/libgnomeprint/gnome-print-master-preview.h
> +include/gnome-1.0/libgnomeprint/gnome-print-master.h
> +include/gnome-1.0/libgnomeprint/gnome-print-meta.h
> +include/gnome-1.0/libgnomeprint/gnome-print-multipage.h
> +include/gnome-1.0/libgnomeprint/gnome-print-pdf.h
> +include/gnome-1.0/libgnomeprint/gnome-print-pixbuf.h
> +include/gnome-1.0/libgnomeprint/gnome-print-preview.h
> +include/gnome-1.0/libgnomeprint/gnome-print-rbuf.h
> +include/gnome-1.0/libgnomeprint/gnome-print.h
> +include/gnome-1.0/libgnomeprint/gnome-printer-dialog.h
> +include/gnome-1.0/libgnomeprint/gnome-printer.h
> +include/gnome-1.0/libgnomeprint/gnome-rfont.h
> +include/gnome-1.0/libgnomeprint/gnome-text.h
> lib/libgnomeprint.a
> lib/libgnomeprint.so
> lib/libgnomeprint.so.16
> +share/gnome/fonts/README.binaries
> share/gnome/fonts/README.installer
> share/gnome/fonts/afms/adobe/pagd8a.afm
> share/gnome/fonts/afms/adobe/pagdo8a.afm
> @@ -67,7 +69,6 @@
> share/gnome/fonts/afms/adobe/putri8a.afm
> share/gnome/fonts/afms/adobe/pzcmi8a.afm
> share/gnome/fonts/afms/adobe/pzdr.afm
> -share/gnome/fonts/fontmap2
> share/gnome/gnome-print/%%VERSION%%/profiles/PostscriptOptimized.profile
> share/gnome/gnome-print/%%VERSION%%/profiles/fax-g3.profile
> share/gnome/gnome-print/%%VERSION%%/profiles/pdf.profile
> @@ -88,6 +89,7 @@
> share/locale/ko/LC_MESSAGES/gnome-print.mo
> share/locale/lt/LC_MESSAGES/gnome-print.mo
> share/locale/nl/LC_MESSAGES/gnome-print.mo
> +share/locale/nn/LC_MESSAGES/gnome-print.mo
> share/locale/no/LC_MESSAGES/gnome-print.mo
> share/locale/pl/LC_MESSAGES/gnome-print.mo
> share/locale/pt_BR/LC_MESSAGES/gnome-print.mo
> @@ -99,10 +101,14 @@
> share/locale/tr/LC_MESSAGES/gnome-print.mo
> share/locale/uk/LC_MESSAGES/gnome-print.mo
> share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-print.mo
> -@dirrm share/gnome/fonts/afms/adobe
> -@dirrm share/gnome/fonts/afms
> -@dirrm share/gnome/fonts
> +share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
> @dirrm share/gnome/gnome-print/%%VERSION%%/profiles
> @dirrm share/gnome/gnome-print/%%VERSION%%
> @dirrm share/gnome/gnome-print
> -@dirrm include/libgnomeprint
> +@dirrm share/gnome/fonts/afms/adobe
> +@dirrm share/gnome/fonts/afms
> +@dirrm share/gnome/fonts
> +@dirrm include/gnome-1.0/libgnomeprint
> +@dirrm include/gnome-1.0
> +@dirrm etc/gnome/fonts
> +@dirrm etc/gnome
> Index: ports/print/gnomeprint/files/patch-ab
> ===================================================================
> RCS file: /home/ncvs/ports/print/gnomeprint/files/patch-ab,v
> retrieving revision 1.3
> diff -d -u -r1.3 patch-ab
> --- ports/print/gnomeprint/files/patch-ab 1999/08/22
> 03:46:55 1.3
> +++ ports/print/gnomeprint/files/patch-ab 2001/10/05 13:28:29
> @@ -1,11 +1,32 @@
> ---- Makefile.in.orig Fri Jul 9 00:54:02 1999
> -+++ Makefile.in Mon Jul 12 13:21:25 1999
> -@@ -163,7 +163,7 @@
> - EXTRA_DIST = printConf.sh.in gnome-print.spec
> +
> +$FreeBSD$
> +
> +--- Makefile.in.orig Fri Oct 5 11:37:00 2001
> ++++ Makefile.in Fri Oct 5 11:40:45 2001
> +@@ -157,7 +157,7 @@
> + @LIBGPA_TRUE@LIBGPA_DIR = libgpa data
> + @LIBGPA_FALSE@LIBGPA_DIR =
>
> +-SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts
> tests $(INSTALLER_DIR)
> ++SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts
> $(INSTALLER_DIR)
> +
> + INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)/intl
> -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) @PRINT_INCLUDEDIR@ -DPROFILEDIR=\""$(profilesdir)"\"
>
> +@@ -171,7 +171,7 @@
> + EXTRA_DIST = printConf.sh.in gnome-print.spec.in gnome-print.spec run-gnome-font-install
> +
> +
> -confexecdir = $(libdir)
> +confexecdir = $(sysconfdir)
> confexec_DATA = printConf.sh
>
> - gnome_font_install_SOURCES = gnome-font-install.c
> + CLEANFILES = printConf.sh
> +@@ -192,7 +192,7 @@
> + TAR = gtar
> + GZIP_ENV = --best
> + DIST_SUBDIRS = intl po libgpa data libgnomeprint afms profiles
> fonts \
> +-tests installer
> ++installer
> + all: all-redirect
> + .SUFFIXES:
> + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
> $(top_srcdir)/configure.in $(ACLOCAL_M4)
> Index: ports/print/gnomeprint/files/patch-ac
> ===================================================================
> RCS file: patch-ac
> diff -N patch-ac
> --- /tmp/cvsrflA5o6u34 Fri Oct 5 06:28:30 2001
> +++ /dev/null Fri Oct 5 06:08:23 2001
> @@ -1,8 +0,0 @@
> ---- installer/gf-pfb.c.orig Thu Nov 16 20:22:10 2000
> -+++ installer/gf-pfb.c Thu Mar 15 19:26:11 2001
> -@@ -6,4 +6,4 @@
> -
> --#include <sys/mman.h>
> - #include <sys/types.h>
> -+#include <sys/mman.h>
> - #include <sys/stat.h>
> Index: ports/print/gnomeprint/files/patch-ltmain.sh
> ===================================================================
> RCS file: patch-ltmain.sh
> diff -N patch-ltmain.sh
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-ltmain.sh Fri Oct 5 06:28:29 2001
> @@ -0,0 +1,18 @@
> +
> +$FreeBSD$
> +
> +--- ltmain.sh 2001/08/27 09:51:26 1.1
> ++++ ltmain.sh 2001/08/27 09:51:42
> +@@ -4175,10 +4175,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: ports/print/gnomeprint/files/patch-po::Makefile.in.in
> ===================================================================
> RCS file: patch-po::Makefile.in.in
> diff -N patch-po::Makefile.in.in
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-po::Makefile.in.in Fri Oct 5 06:28:29 2001
> @@ -0,0 +1,23 @@
> +
> +$FreeBSD$
> +
> +--- po/Makefile.in.in 2001/10/05 11:35:53 1.1
> ++++ po/Makefile.in.in 2001/10/05 11:36:35
> +@@ -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 \
> +@@ -126,7 +126,7 @@
> + catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
> ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \
> + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo;
> \
> + done
> + if test "$(PACKAGE)" = "gettext"; then \
> Index: ports/graphics/librsvg/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/graphics/librsvg/Makefile,v
> retrieving revision 1.4
> diff -d -u -r1.4 Makefile
> --- ports/graphics/librsvg/Makefile 2001/07/12
> 10:10:29 1.4
> +++ ports/graphics/librsvg/Makefile 2001/10/05 13:28:29
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= librsvg
> -PORTVERSION= 1.0.1
> +PORTVERSION= 1.0.2
> CATEGORIES= graphics gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= stable/sources/librsvg
> @@ -21,9 +21,8 @@
> USE_GMAKE= yes
> USE_X_PREFIX= yes
> USE_GNOMELIBS= yes
> -USE_LIBTOOL= yes
> INSTALLS_SHLIB= yes
> -
> +GNU_CONFIGURE= yes
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LIBS="-L${LOCALBASE}/lib"
>
> Index: ports/graphics/librsvg/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/graphics/librsvg/distinfo,v
> retrieving revision 1.2
> diff -d -u -r1.2 distinfo
> --- ports/graphics/librsvg/distinfo 2001/07/06
> 12:22:50 1.2
> +++ ports/graphics/librsvg/distinfo 2001/10/05 13:28:29
> @@ -1 +1 @@
> -MD5 (librsvg-1.0.1.tar.gz) = aea434dc24aba3f1952e2a0aade8ed4e
> +MD5 (librsvg-1.0.2.tar.gz) = 4bfa03ec2218ee29e8364c80e3c4a3ae
> Index: ports/graphics/librsvg/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/graphics/librsvg/pkg-plist,v
> retrieving revision 1.1
> diff -d -u -r1.1 pkg-plist
> --- ports/graphics/librsvg/pkg-plist 2001/05/08
> 18:56:58 1.1
> +++ ports/graphics/librsvg/pkg-plist 2001/10/05 13:28:29
> @@ -1,20 +1,21 @@
> bin/librsvg-config
> etc/librsvgConf.sh
> -include/librsvg/art_render.h
> -include/librsvg/art_render_gradient.h
> -include/librsvg/art_render_mask.h
> -include/librsvg/art_render_svp.h
> -include/librsvg/art_rgba.h
> -include/librsvg/librsvg-features.h
> -include/librsvg/rsvg-bpath-util.h
> -include/librsvg/rsvg-css.h
> -include/librsvg/rsvg-defs.h
> -include/librsvg/rsvg-ft.h
> -include/librsvg/rsvg-paint-server.h
> -include/librsvg/rsvg-path.h
> -include/librsvg/rsvg.h
> +include/librsvg-1/librsvg/art_render.h
> +include/librsvg-1/librsvg/art_render_gradient.h
> +include/librsvg-1/librsvg/art_render_mask.h
> +include/librsvg-1/librsvg/art_render_svp.h
> +include/librsvg-1/librsvg/art_rgba.h
> +include/librsvg-1/librsvg/librsvg-features.h
> +include/librsvg-1/librsvg/rsvg-bpath-util.h
> +include/librsvg-1/librsvg/rsvg-css.h
> +include/librsvg-1/librsvg/rsvg-defs.h
> +include/librsvg-1/librsvg/rsvg-ft.h
> +include/librsvg-1/librsvg/rsvg-paint-server.h
> +include/librsvg-1/librsvg/rsvg-path.h
> +include/librsvg-1/librsvg/rsvg.h
> lib/librsvg.a
> lib/librsvg.so
> lib/librsvg.so.1
> share/aclocal/librsvg.m4
> -@dirrm include/librsvg
> +@dirrm include/librsvg-1/librsvg
> +@dirrm include/librsvg-1
> Index: ports/graphics/librsvg/files/patch-librsvg-config.in
> ===================================================================
> RCS file: patch-librsvg-config.in
> diff -N patch-librsvg-config.in
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-librsvg-config.in Fri Oct 5 06:28:29 2001
> @@ -0,0 +1,16 @@
> +
> +$FreeBSD$
> +
> +--- librsvg-config.in 2001/10/05 14:55:24 1.1
> ++++ librsvg-config.in 2001/10/05 15:05:57
> +@@ -39,9 +39,7 @@
> + echo @LIBRSVG_VERSION@
> + ;;
> + --cflags)
> +- if test @includedir@ != /usr/include ; then
> +- includes=-I@includedir@
> +- fi
> ++ includes=-I@includedir@/librsvg-1
> + echo $includes
> + ;;
> + --libs)
> Index: ports/graphics/librsvg/files/patch-ltmain.sh
> ===================================================================
> RCS file: patch-ltmain.sh
> diff -N patch-ltmain.sh
> --- /dev/null Fri Oct 5 06:08:23 2001
> +++ patch-ltmain.sh Fri Oct 5 06:28:29 2001
> @@ -0,0 +1,18 @@
> +
> +$FreeBSD$
> +
> +--- ltmain.sh 2001/08/27 09:51:26 1.1
> ++++ ltmain.sh 2001/08/27 09:51:42
> +@@ -4175,10 +4175,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: ports/devel/bonobo/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/devel/bonobo/Makefile,v
> retrieving revision 1.41
> diff -d -u -r1.41 Makefile
> --- ports/devel/bonobo/Makefile 2001/10/01 06:39:14 1.41
> +++ ports/devel/bonobo/Makefile 2001/10/05 13:28:29
> @@ -34,10 +34,4 @@
> 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
> s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
>
> -post-install:
> - @if [ -L ${PREFIX}/include/bonobo ]; then \
> - ${RM} -f ${PREFIX}/include/bonobo; \
> - fi
> - @${LN} -sf ${PREFIX}/include/gnome-1.0/bonobo
> ${PREFIX}/include/bonobo
> -
> .include <bsd.port.mk>
> Index: ports/devel/bonobo/pkg-plist
> ===================================================================
> RCS file: /home/ncvs/ports/devel/bonobo/pkg-plist,v
> retrieving revision 1.23
> diff -d -u -r1.23 pkg-plist
> --- ports/devel/bonobo/pkg-plist 2001/10/01
> 06:39:14 1.23
> +++ ports/devel/bonobo/pkg-plist 2001/10/05 13:28:29
> @@ -19,7 +19,6 @@
> etc/bonoboConf.sh
> etc/bonoboxConf.sh
> etc/bonobox_printConf.sh
> -include/bonobo
> include/bonobo.h
> include/efs.h
> include/efs_error.h
> @@ -196,4 +195,3 @@
> @dirrm lib/bonobo/monikers
> @dirrm lib/bonobo
> @dirrm include/gnome-1.0/bonobo
> -@dirrm include/gnome-1.0
> Index: ports/x11/gnomelibs/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/x11/gnomelibs/Makefile,v
> retrieving revision 1.90
> diff -d -u -r1.90 Makefile
> --- ports/x11/gnomelibs/Makefile 2001/09/12
> 15:39:01 1.90
> +++ ports/x11/gnomelibs/Makefile 2001/10/05 13:28:29
> @@ -7,6 +7,7 @@
>
> PORTNAME= gnomelibs
> PORTVERSION= 1.4.1.2
> +PORTREVISION= 1
> CATEGORIES?= x11 gnome
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= stable/sources/gnome-libs
> Index: ports/x11/gnomelibs/files/patch-aa
> ===================================================================
> RCS file: /home/ncvs/ports/x11/gnomelibs/files/patch-aa,v
> retrieving revision 1.16
> diff -d -u -r1.16 patch-aa
> --- ports/x11/gnomelibs/files/patch-aa 2001/08/22
> 18:06:36 1.16
> +++ ports/x11/gnomelibs/files/patch-aa 2001/10/05 13:28:29
> @@ -1,8 +1,8 @@
>
> $FreeBSD$
>
> ---- configure.orig Wed Aug 22 16:15:39 2001
> -+++ configure Wed Aug 22 16:17:10 2001
> +--- configure.orig Fri Oct 5 10:53:42 2001
> ++++ configure Fri Oct 5 12:02:38 2001
> @@ -5416,7 +5416,7 @@
> else
>
> @@ -33,7 +33,7 @@
>
> GNOME_LIBDIR='-L${libdir}'
> -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H
> -I${pkglibdir}/include'
> -+GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H'
> ++GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -I${includedir}
> -DNEED_GNOMESUPPORT_H'
> GNOME_IDLDIR='-I${datadir}/idl'
>
>
> Index: ports/graphics/sodipodi/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/graphics/sodipodi/Makefile,v
> retrieving revision 1.29
> diff -d -u -r1.29 Makefile
> --- ports/graphics/sodipodi/Makefile 2001/10/01
> 06:39:34 1.29
> +++ ports/graphics/sodipodi/Makefile 2001/10/05 13:28:29
> @@ -6,7 +6,7 @@
> #
>
> PORTNAME= sodipodi
> -PORTVERSION= 0.24
> +PORTVERSION= 0.24.1
> CATEGORIES= graphics gnome
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR= ${PORTNAME}
> Index: ports/graphics/sodipodi/distinfo
> ===================================================================
> RCS file: /home/ncvs/ports/graphics/sodipodi/distinfo,v
> retrieving revision 1.9
> diff -d -u -r1.9 distinfo
> --- ports/graphics/sodipodi/distinfo 2001/10/01
> 06:39:34 1.9
> +++ ports/graphics/sodipodi/distinfo 2001/10/05 13:28:29
> @@ -1 +1 @@
> -MD5 (sodipodi-0.24.tar.gz) = 87cbb29d00a5ad2c9ec84a45bf5c0431
> +MD5 (sodipodi-0.24.1.tar.gz) = 1bb1c07993e6cee32ae2b2d8c39b9b40
> Index: ports/graphics/sodipodi/files/patch-configure
> ===================================================================
> RCS file: /home/ncvs/ports/graphics/sodipodi/files/patch-configure,v
> retrieving revision 1.1
> diff -d -u -r1.1 patch-configure
> --- ports/graphics/sodipodi/files/patch-configure 2001/10/01
> 06:39:34 1.1
> +++ ports/graphics/sodipodi/files/patch-configure 2001/10/05
> 13:28:29
> @@ -1,9 +1,27 @@
>
> -$FreeBSD: ports/graphics/sodipodi/files/patch-configure,v 1.1
> 2001/10/01 06:39:34 sobomax Exp $
> +$FreeBSD$
>
> ---- configure 2001/09/28 13:29:15 1.1
> -+++ configure 2001/09/28 13:29:37
> -@@ -3974,7 +3974,7 @@
> +--- configure.orig Fri Oct 5 16:18:14 2001
> ++++ configure Fri Oct 5 16:21:24 2001
> +@@ -2481,6 +2481,9 @@
> +
> + GNOME_PRINT_LIBS=`gnome-config --libs print`
> +
> ++_CPPFLAGS="$CPPFLAGS"
> ++CPPFLAGS="$CPPFLAGS `gnome-config --cflags print`"
> ++
> +
> + ac_safe=`echo "libgnomeprint/gnome-print-frgba.h" | sed
> 'y%./+-%__p_%'`
> + echo $ac_n "checking for libgnomeprint/gnome-print-frgba.h""...
> $ac_c" 1>&6
> +@@ -2590,6 +2593,7 @@
> + echo "$ac_t""no" 1>&6
> + fi
> +
> ++CPPFLAGS="$_CPPFLAGS"
> +
> + ALL_LINGUAS="ca da de es et fr ga gl hu it ja no ru sl sv tr uk pl
> pt_BR"
> +
> +@@ -3974,7 +3978,7 @@
> fi
>
>
> @@ -12,7 +30,7 @@
> fi
>
> else
> -@@ -4096,7 +4096,7 @@
> +@@ -4096,7 +4100,7 @@
>
> BUILD_INCLUDED_LIBINTL=yes
> USE_INCLUDED_LIBINTL=yes
>
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011005223443.A73833>