Date: Fri, 05 Jul 2002 21:29:11 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: Joe Marcus Clarke <marcus@marcuscom.com> Cc: gnome@FreeBSD.ORG Subject: Re: GNOME1 core ports lock Message-ID: <3D25E577.ACBD40DA@FreeBSD.org> References: <3D257693.1FDB5AE8@FreeBSD.org> <3D25CF82.FD5571B9@FreeBSD.org> <1025888819.8641.19.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------8B564B3DE80F2F32D61B3EF4
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Joe Marcus Clarke wrote:
>
> On Fri, 2002-07-05 at 12:55, Maxim Sobolev wrote:
> > Maxim Sobolev wrote:
> > >
> > > Folks,
> > >
> > > I am currently in the process of converting all GNOME1 core ports to
> > > bsd.gnomeNG.mk framework, so that please avoid committing into them
> > > until the result is committed.
> >
> > Sorry folks, but due to unrelated issues I ran out of time and was
> > unable to complete the task. I will resume the work on Monday, so that
> > until then feel free to commit into GNOME1 ports.
>
> Do you want me to pick it up for you? I have some time.
Thank you for the proposal - your help is really appreciated. Attached
are patches generated so far (please note that bonobo is still
untested). The main amount of work is to check that dependencies in
bsd.gnomeng.mk are reflecting reality (e.g. gnomeprint_USE_GNOME_IMPL
change) and check that there is no conflicts between gnomehier and
ports' pkg-plists. The former is performed by inspecting configure
script content and/or output, while the latter is verified by
installing each particular port after conversion to bsd.gnomeng.mk and
then by removing the whole GNOME1 tree with pkg_delete -r
gnomehier-\*.
Good luck and thank you in advance!
-Maxim
--------------8B564B3DE80F2F32D61B3EF4
Content-Type: text/plain; charset=koi8-r;
name="gnome1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="gnome1.diff"
? devel/gconf/pkg-plist,v
? devel/oaf/pkg-plist,v
? devel/gnomevfs/pkg-plist,v
? devel/bonobo/pkg-plist,v
? x11/gnomelibs/Makefile,v
? x11/gnomelibs/pkg-plist,v
? print/gnomeprint/pkg-plist,v
? sysutils/gnomecontrolcenter/pkg-plist,v
Index: Mk/bsd.gnomeng.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.gnomeng.mk,v
retrieving revision 1.5
diff -d -u -r1.5 bsd.gnomeng.mk
--- Mk/bsd.gnomeng.mk 5 Jul 2002 10:00:02 -0000 1.5
+++ Mk/bsd.gnomeng.mk 5 Jul 2002 18:18:33 -0000
@@ -39,9 +39,10 @@
gnomehier_RUN_DEPENDS= ${X11BASE}/share/gnome/.keep_me:${PORTSDIR}/misc/gnomehier
gnomehier_DETECT= ${X11BASE}/share/gnome/.keep_me
+GNOME_HTML_DIR?= ${PREFIX}/share/doc
gnomeprefix_CONFIGURE_ARGS=--localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
- --with-html-dir=${PREFIX}/share/doc \
+ --with-html-dir=${GNOME_HTML_DIR} \
--disable-gtk-doc
gnomeprefix_USE_GNOME_IMPL=gnomehier
@@ -128,10 +129,11 @@
oaf_DETECT= ${OAF_CONFIG}
oaf_USE_GNOME_IMPL= glib12 orbit libxml
+gnomemimedata_BUILD_DEPENDS=${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
gnomemimedata_RUN_DEPENDS=${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
gnomemimedata_PKGNAMESUFFIX=-gnomemimedata
gnomemimedata_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
-gnomemimedata_USE_GNOME_IMPL=gnomelibs
+gnomemimedata_USE_GNOME_IMPL=gnomehier
GCONF_CONFIG?= ${X11BASE}/bin/gconf-config
gconf_LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf
@@ -147,7 +149,7 @@
gnomevfs_MAKE_ENV= GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}"
gnomevfs_PKGNAMESUFFIX= -gnomevfs
gnomevfs_DETECT= ${GNOME_VFS_CONFIG}
-gnomevfs_USE_GNOME_IMPL=gnomemimedata gconf
+gnomevfs_USE_GNOME_IMPL=gnomemimedata gconf gnomelibs
gnomecc_LIB_DEPENDS= capplet.5:${PORTSDIR}/sysutils/gnomecontrolcenter
gnomecc_PKGNAMESUFFIX= -gnomecc
@@ -157,12 +159,12 @@
gnomeprint_LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint
gnomeprint_PKGNAMESUFFIX=-gnomeprint
gnomeprint_DETECT= ${X11BASE}/etc/printConf.sh
-gnomeprint_USE_GNOME_IMPL=gnomecc
+gnomeprint_USE_GNOME_IMPL=gnomelibs gnomecanvas
bonobo_LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo
bonobo_PKGNAMESUFFIX= -bonobo
bonobo_DETECT= ${X11BASE}/etc/bonoboConf.sh
-bonobo_USE_GNOME_IMPL= gnomeprint
+bonobo_USE_GNOME_IMPL= oaf gnomeprint
GDA_CONFIG?= ${X11BASE}/bin/gda-config
libgda_LIB_DEPENDS= gda-client.0:${PORTSDIR}/databases/libgda
Index: devel/gconf/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gconf/Makefile,v
retrieving revision 1.30
diff -d -u -r1.30 Makefile
--- devel/gconf/Makefile 19 Jun 2002 16:43:41 -0000 1.30
+++ devel/gconf/Makefile 5 Jul 2002 18:18:33 -0000
@@ -16,28 +16,21 @@
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile \
- oaf.0:${PORTSDIR}/devel/oaf \
db3.2:${PORTSDIR}/databases/db3
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOMELIBS= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomeprefix gnomehack glib12 gtk12 oaf libxml orbit
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
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 ; \
+post-patch:
+ @${REINPLACE_CMD} -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-post-install:
- @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps
- @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/schemas/apps
.include <bsd.port.mk>
Index: devel/gconf/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/gconf/pkg-plist,v
retrieving revision 1.21
diff -d -u -r1.21 pkg-plist
--- devel/gconf/pkg-plist 1 May 2002 01:35:34 -0000 1.21
+++ devel/gconf/pkg-plist 5 Jul 2002 18:18:33 -0000
@@ -61,18 +61,3 @@
@dirrm include/gconf/1/gconf
@dirrm include/gconf/1
@dirrm etc/gconf/1
-@exec /bin/mkdir -p %D/etc/gconf/gconf.xml.defaults/apps
-@exec /bin/mkdir -p %D/etc/gconf/gconf.xml.defaults/schemas/apps
-@unexec /bin/rmdir %D/lib/GConf 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/include/gconf 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -f %D/etc/gconf/gconf.xml.defaults/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rm -f %D/etc/gconf/gconf.xml.defaults/apps/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rm -f %D/etc/gconf/gconf.xml.defaults/schemas/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rm -f %D/etc/gconf/gconf.xml.defaults/schemas/apps/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rmdir %D/etc/gconf/schemas 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.mandatory 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/gconf 2>/dev/null || /usr/bin/true
Index: devel/gconf/files/patch-ab
===================================================================
RCS file: devel/gconf/files/patch-ab
diff -N devel/gconf/files/patch-ab
--- devel/gconf/files/patch-ab 23 May 2001 00:48:59 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- Makefile.in.orig Mon May 14 13:07:48 2001
-+++ Makefile.in Mon May 21 23:29:41 2001
-@@ -37,3 +37,3 @@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -144,3 +144,3 @@
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = gconf.pc gconfgtk.pc
-@@ -476,4 +476,4 @@
- install-data-local:
-- -mkdir -p $(DESTDIR)$(datadir)/aclocal
-- $(INSTALL_DATA) gconf.m4 $(DESTDIR)$(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
-+ -mkdir -p $(DESTDIR)$(prefix)/share/aclocal
-+ $(INSTALL_DATA) gconf.m4 $(DESTDIR)$(prefix)/share/aclocal/gconf-$(MAJOR_VERSION).m4
- @echo "**** NOTE ****"
Index: devel/oaf/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/oaf/Makefile,v
retrieving revision 1.19
diff -d -u -r1.19 Makefile
--- devel/oaf/Makefile 18 Apr 2002 14:01:03 -0000 1.19
+++ devel/oaf/Makefile 5 Jul 2002 18:18:33 -0000
@@ -19,23 +19,20 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_GNOMELIBS= yes
CONFIGURE_ARGS= --enable-static --enable-shared \
- --disable-more-warnings --disable-gtk-doc
+ --disable-more-warnings
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= oafd.1
-pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+ @${REINPLACE_CMD} -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
Index: devel/oaf/files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/devel/oaf/files/patch-aa,v
retrieving revision 1.1
diff -d -u -r1.1 patch-aa
--- devel/oaf/files/patch-aa 1 Jun 2000 20:16:24 -0000 1.1
+++ devel/oaf/files/patch-aa 5 Jul 2002 18:18:33 -0000
@@ -1,15 +1,14 @@
---- Makefile.in.orig Wed May 10 02:42:25 2000
-+++ Makefile.in Thu Jun 1 14:21:12 2000
-@@ -95,10 +95,10 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig Fri Jul 5 11:27:26 2002
++++ Makefile.in Fri Jul 5 11:28:17 2002
+@@ -145,7 +145,7 @@
+ oafconfig_DATA = oaf-config.xml oaf-config.xml.sample $(NULL)
- EXTRA_DIST = oaf-config.in oaf.m4 oafConf.sh.in oafConf.sh
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
confexec_DATA = oafConf.sh
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = oaf.m4
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ m4datadir = $(prefix)/share/aclocal
Index: devel/gnomevfs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v
retrieving revision 1.36
diff -d -u -r1.36 Makefile
--- devel/gnomevfs/Makefile 6 May 2002 19:49:44 -0000 1.36
+++ devel/gnomevfs/Makefile 5 Jul 2002 18:18:33 -0000
@@ -16,37 +16,29 @@
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
-LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \
- iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOMELIBS= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
+ gnomemimedata gnomelibs
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
- --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+ @${REINPLACE_CMD} -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
- @find ${WRKSRC} -name 'xml-i18n-*' | xargs ${PERL} -pi -e \
+ @find ${WRKSRC} -name 'xml-i18n-*' | xargs ${REINPLACE_CMD} -e \
's|/usr/local/bin/perl|${PERL}|g'
-
-post-patch:
- @${PERL} -pi -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \
+ @${REINPLACE_CMD} -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \
${WRKSRC}/libgnomevfs/libcharset/Makefile.in
.include <bsd.port.mk>
Index: devel/gnomevfs/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/pkg-plist,v
retrieving revision 1.16
diff -d -u -r1.16 pkg-plist
--- devel/gnomevfs/pkg-plist 8 Apr 2002 17:22:58 -0000 1.16
+++ devel/gnomevfs/pkg-plist 5 Jul 2002 18:18:33 -0000
@@ -111,10 +111,6 @@
share/locale/uk/LC_MESSAGES/gnome-vfs.mo
share/locale/wa/LC_MESSAGES/gnome-vfs.mo
share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
-@dirrm lib/vfs/modules
@dirrm lib/vfs/extfs
@dirrm include/gnome-vfs-1.0/libgnomevfs
@dirrm include/gnome-vfs-1.0
-@dirrm etc/vfs/modules
-@dirrm etc/vfs
-@unexec /bin/rmdir %D/lib/vfs 2>/dev/null || /usr/bin/true
Index: devel/bonobo/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bonobo/Makefile,v
retrieving revision 1.53
diff -d -u -r1.53 Makefile
--- devel/bonobo/Makefile 1 May 2002 01:37:45 -0000 1.53
+++ devel/bonobo/Makefile 5 Jul 2002 18:18:33 -0000
@@ -15,27 +15,22 @@
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_GNOMECTRL= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomeprefix oaf gnomehier gnomeprint
+GNOME_HTML_DIR= ${PREFIX}/share/doc/bonobo
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
LIBTOOLFILES= configure libefs/configure
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc/bonobo
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 ; \
+post-patch:
+ @${REINPLACE_CMD} -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
Index: devel/bonobo/files/patch-ac
===================================================================
RCS file: devel/bonobo/files/patch-ac
diff -N devel/bonobo/files/patch-ac
--- devel/bonobo/files/patch-ac 23 May 2001 00:48:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- libefs/Makefile.in.orig Mon May 14 17:01:15 2001
-+++ libefs/Makefile.in Tue May 22 11:04:58 2001
-@@ -37,3 +37,3 @@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -85,3 +85,3 @@
-
--pcdir = $(libdir)/pkgconfig
-+pcdir = $(pkglibdir)
- pc_SCRIPTS = libefs.pc
Index: graphics/gnomecanvas/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gnomecanvas/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- graphics/gnomecanvas/Makefile 9 Nov 2001 16:24:21 -0000 1.2
+++ graphics/gnomecanvas/Makefile 5 Jul 2002 18:18:33 -0000
@@ -8,15 +8,14 @@
PORTNAME= gnomecanvas
CATEGORIES= graphics gnome
-LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
MASTERDIR= ${.CURDIR}/../gdk-pixbuf
COMMENT= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USE_GNOMELIBS= yes
+USE_GNOMENG= yes
+USE_GNOME= gdkpixbuf gnomelibs
BUILD_CANVAS= yes
Index: misc/gnomehier/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/gnomehier/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- misc/gnomehier/Makefile 4 Jul 2002 16:27:32 -0000 1.2
+++ misc/gnomehier/Makefile 5 Jul 2002 18:18:33 -0000
@@ -7,7 +7,7 @@
PORTNAME= gnomehier
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= # none
DISTFILES= # none
@@ -16,6 +16,8 @@
NO_BUILD= yes
NO_WRKSUBDIR= yes
+
+USE_X_PREFIX= yes
do-fetch:
@${DO_NADA}
Index: misc/gnomehier/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/gnomehier/pkg-plist,v
retrieving revision 1.1
diff -d -u -r1.1 pkg-plist
--- misc/gnomehier/pkg-plist 2 Jul 2002 09:38:44 -0000 1.1
+++ misc/gnomehier/pkg-plist 5 Jul 2002 18:18:33 -0000
@@ -17,6 +17,7 @@
etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/.keep_me
etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/.keep_me
etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/.keep_me
+etc/gconf/gconf.xml.mandatory/.keep_me
etc/gconf/schemas/.keep_me
etc/gdm/.keep_me
etc/gdm/Init/.keep_me
@@ -26,13 +27,12 @@
etc/gnome-vfs-2.0/.keep_me
etc/gnome-vfs-2.0/modules/.keep_me
etc/gnome/.keep_me
+etc/gnome/config/.keep_me
etc/sound/.keep_me
etc/sound/events/.keep_me
etc/vfs/.keep_me
etc/vfs/modules/.keep_me
include/gconf/.keep_me
-include/gdk-pixbuf-1.0/.keep_me
-include/gdk-pixbuf-1.0/gdk-pixbuf/.keep_me
include/gdkcardimage/.keep_me
include/gnome-1.0/.keep_me
include/libnautilus/.keep_me
@@ -51,7 +51,6 @@
lib/vfs/modules/.keep_me
libdata/bonobo/.keep_me
libdata/bonobo/servers/.keep_me
-libexec/rep/.keep_me
libexec/sawfish/.keep_me
share/doc/libgda/.keep_me
share/gnome/.keep_me
@@ -243,14 +242,6 @@
share/gnome/xbill/pixmaps/.keep_me
share/gnome/xmodmap/.keep_me
share/sawfish/.keep_me
-share/themes/.keep_me
-share/themes/Default/.keep_me
-share/themes/Metal/.keep_me
-share/themes/Redmond95/.keep_me
-@dirrm share/themes/Redmond95
-@dirrm share/themes/Metal
-@dirrm share/themes/Default
-@dirrm share/themes
@dirrm share/sawfish
@dirrm share/gnome/xmodmap
@dirrm share/gnome/xbill/pixmaps
@@ -442,7 +433,6 @@
@dirrm share/gnome
@dirrm share/doc/libgda
@dirrm libexec/sawfish
-@dirrm libexec/rep
@dirrm libdata/bonobo/servers
@dirrm libdata/bonobo
@dirrm lib/vfs/modules
@@ -461,8 +451,6 @@
@dirrm include/libnautilus
@dirrm include/gnome-1.0
@dirrm include/gdkcardimage
-@dirrm include/gdk-pixbuf-1.0/gdk-pixbuf
-@dirrm include/gdk-pixbuf-1.0
@dirrm include/gconf
@dirrm etc/vfs/modules
@dirrm etc/vfs
@@ -470,6 +458,7 @@
@dirrm etc/sound
@dirrm etc/gnome-vfs-2.0/modules
@dirrm etc/gnome-vfs-2.0
+@dirrm etc/gnome/config
@dirrm etc/gnome
@dirrm etc/gdm/Sessions
@dirrm etc/gdm/PreSession
@@ -477,6 +466,7 @@
@dirrm etc/gdm/Init
@dirrm etc/gdm
@dirrm etc/gconf/schemas
+@dirrm etc/gconf/gconf.xml.mandatory
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
Index: misc/gnomehier/files/dirlist
===================================================================
RCS file: /home/ncvs/ports/misc/gnomehier/files/dirlist,v
retrieving revision 1.2
diff -d -u -r1.2 dirlist
--- misc/gnomehier/files/dirlist 4 Jul 2002 16:27:32 -0000 1.2
+++ misc/gnomehier/files/dirlist 5 Jul 2002 18:18:33 -0000
@@ -17,6 +17,7 @@
etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
+etc/gconf/gconf.xml.mandatory
etc/gconf/schemas
etc/gdm
etc/gdm/Init
@@ -24,6 +25,7 @@
etc/gdm/PreSession
etc/gdm/Sessions
etc/gnome
+etc/gnome/config
etc/gnome-vfs-2.0
etc/gnome-vfs-2.0/modules
etc/sound
@@ -31,8 +33,6 @@
etc/vfs
etc/vfs/modules
include/gconf
-include/gdk-pixbuf-1.0
-include/gdk-pixbuf-1.0/gdk-pixbuf
include/gdkcardimage
include/gnome-1.0
include/libnautilus
@@ -51,7 +51,6 @@
lib/vfs/modules
libdata/bonobo
libdata/bonobo/servers
-libexec/rep
libexec/sawfish
share/doc/libgda
share/gnome
Index: x11/gnomelibs/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/gnomelibs/Makefile,v
retrieving revision 1.100
diff -d -u -r1.100 Makefile
--- x11/gnomelibs/Makefile 24 May 2002 03:26:41 -0000 1.100
+++ x11/gnomelibs/Makefile 5 Jul 2002 18:18:33 -0000
@@ -16,8 +16,6 @@
MAINTAINER?= gnome@FreeBSD.org
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS+= xml.5:${PORTSDIR}/textproc/libxml \
- ORBit.2:${PORTSDIR}/devel/ORBit
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
@@ -25,16 +23,12 @@
USE_XPM= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_IMLIB= yes
-USE_ESOUND= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomeprefix esound gtk12 imlib libxml orbit
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
LIBTOOLFILES= configure libart_lgpl/configure
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --disable-test-gnome \
- --disable-gtk-doc \
- --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --disable-test-gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -45,15 +39,10 @@
libart-config.1 loadshlib.1 new-object.1
MAN5= gnome-mime.5
-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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
post-patch:
- @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c
# need to make launched gnome-terminals appear in utmp/wtmp
Index: x11/gnomelibs/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/gnomelibs/pkg-plist,v
retrieving revision 1.36
diff -d -u -r1.36 pkg-plist
--- x11/gnomelibs/pkg-plist 1 May 2002 20:23:03 -0000 1.36
+++ x11/gnomelibs/pkg-plist 5 Jul 2002 18:18:33 -0000
@@ -538,14 +538,9 @@
share/locale/wa/LC_MESSAGES/gnome-libs.mo
share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
-@exec mkdir -p %D/share/gnome/games
@dirrm share/gnome/type-convert
-@dirrm share/gnome/mime-info
-@dirrm share/gnome/idl
@dirrm share/gnome/help/gnome-dev-info/C
@dirrm share/gnome/help/gnome-dev-info
-@dirrm share/gnome/help
-@dirrm share/gnome/games
@dirrm share/gnome/doc
@dirrm share/doc/libart
@dirrm share/doc/gnomelibs/zvt
@@ -559,7 +554,3 @@
@dirrm include/gnome-1.0/libgnome
@dirrm include/gnome-1.0/libart_lgpl
@dirrm include/gnome-1.0/gtk-xmhtml
-@dirrm include/gnome-1.0
-@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/sound/events 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/sound 2>/dev/null || /usr/bin/true
Index: x11/gnomelibs/files/patch-bi
===================================================================
RCS file: /home/ncvs/ports/x11/gnomelibs/files/patch-bi,v
retrieving revision 1.7
diff -d -u -r1.7 patch-bi
--- x11/gnomelibs/files/patch-bi 15 Jan 2002 16:12:51 -0000 1.7
+++ x11/gnomelibs/files/patch-bi 5 Jul 2002 18:18:33 -0000
@@ -1,8 +1,8 @@
-$FreeBSD: ports/x11/gnomelibs/files/patch-bi,v 1.7 2002/01/15 16:12:51 sobomax Exp $
+$FreeBSD$
---- libart_lgpl/Makefile.in.orig Mon Jan 14 12:04:21 2002
-+++ libart_lgpl/Makefile.in Mon Jan 14 12:05:37 2002
+--- libart_lgpl/Makefile.in.orig Sun Jun 23 11:41:23 2002
++++ libart_lgpl/Makefile.in Sun Jun 23 11:42:23 2002
@@ -145,7 +145,7 @@
libart-features.c
@@ -12,12 +12,8 @@
libart_lgpl_la_LIBADD = -lm
libart_lgplincdir = $(includedir)/gnome-1.0/libart_lgpl
-@@ -204,10 +204,10 @@
- testuta_DEPENDENCIES = $(DEPS)
- testuta_LDADD = $(LDADDS) -lm
-
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
+@@ -207,7 +207,7 @@
+ m4datadir = $(prefix)/share/aclocal
m4data_DATA = libart.m4
-confexecdir = $(libdir)
Index: misc/gnomemimedata/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/gnomemimedata/Makefile,v
retrieving revision 1.11
diff -d -u -r1.11 Makefile
--- misc/gnomemimedata/Makefile 15 Jun 2002 09:04:58 -0000 1.11
+++ misc/gnomemimedata/Makefile 5 Jul 2002 18:18:33 -0000
@@ -17,16 +17,13 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOMELIBS= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomehier gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN5= gnome-vfs-mime.5
-
-pre-patch:
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
- 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
.include <bsd.port.mk>
Index: misc/gnomemimedata/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/gnomemimedata/pkg-plist,v
retrieving revision 1.6
diff -d -u -r1.6 pkg-plist
--- misc/gnomemimedata/pkg-plist 15 Jun 2002 09:04:58 -0000 1.6
+++ misc/gnomemimedata/pkg-plist 5 Jul 2002 18:18:33 -0000
@@ -207,4 +207,3 @@
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
@dirrm share/gnome/pixmaps/document-icons
-@dirrm share/gnome/application-registry
Index: print/gnomeprint/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/gnomeprint/Makefile,v
retrieving revision 1.46
diff -d -u -r1.46 Makefile
--- print/gnomeprint/Makefile 6 Jun 2002 04:00:34 -0000 1.46
+++ print/gnomeprint/Makefile 5 Jul 2002 18:18:33 -0000
@@ -25,18 +25,16 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_GNOMECTRL= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
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 ; \
+post-patch:
+ @${REINPLACE_CMD} -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
post-install:
@${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap
Index: print/gnomeprint/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/print/gnomeprint/pkg-plist,v
retrieving revision 1.25
diff -d -u -r1.25 pkg-plist
--- print/gnomeprint/pkg-plist 5 Jun 2002 20:15:52 -0000 1.25
+++ print/gnomeprint/pkg-plist 5 Jul 2002 18:18:33 -0000
@@ -118,5 +118,3 @@
@dirrm share/gnome/fonts/afms
@dirrm include/gnome-1.0/libgnomeprint
@dirrm etc/gnome/fonts
-@dirrm etc/gnome
-@unexec /bin/rmdir %D/share/gnome/fonts 2>/dev/null || /usr/bin/true
Index: sysutils/gnomecontrolcenter/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnomecontrolcenter/Makefile,v
retrieving revision 1.42
diff -d -u -r1.42 Makefile
--- sysutils/gnomecontrolcenter/Makefile 5 May 2002 20:56:10 -0000 1.42
+++ sysutils/gnomecontrolcenter/Makefile 5 Jul 2002 18:18:33 -0000
@@ -16,23 +16,18 @@
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
- gnomevfs.0:${PORTSDIR}/devel/gnomevfs
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOMELIBS= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomeprefix gnomehack gnomecanvas gnomevfs
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 ; \
+post-patch:
+ @${REINPLACE_CMD} -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
Index: sysutils/gnomecontrolcenter/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnomecontrolcenter/pkg-plist,v
retrieving revision 1.21
diff -d -u -r1.21 pkg-plist
--- sysutils/gnomecontrolcenter/pkg-plist 8 Apr 2002 15:54:43 -0000 1.21
+++ sysutils/gnomecontrolcenter/pkg-plist 5 Jul 2002 18:18:34 -0000
@@ -177,7 +177,6 @@
share/locale/wa/LC_MESSAGES/control-center.mo
share/locale/zh_CN/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
@dirrm share/gnome/help/control-center/C/figures
@@ -187,20 +186,7 @@
@dirrm share/gnome/help/control-center/eu
@dirrm share/gnome/help/control-center
@dirrm share/gnome/control-center/UIOptions
-@dirrm share/gnome/control-center/Session
-@dirrm share/gnome/control-center/Peripherals
@dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/Documents
-@dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center
@dirrm share/gnome/apps/Settings/UIOptions
-@dirrm share/gnome/apps/Settings/Session
-@dirrm share/gnome/apps/Settings/Peripherals
@dirrm share/gnome/apps/Settings/Multimedia
-@dirrm share/gnome/apps/Settings/Documents
-@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: textproc/scrollkeeper/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/scrollkeeper/Makefile,v
retrieving revision 1.13
diff -d -u -r1.13 Makefile
--- textproc/scrollkeeper/Makefile 1 Jul 2002 04:51:13 -0000 1.13
+++ textproc/scrollkeeper/Makefile 5 Jul 2002 18:18:34 -0000
@@ -33,6 +33,8 @@
USE_LIBTOOL= yes
USE_BISON= yes
USE_REINPLACE= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack gnomehier
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share/gnome \
--with-omfdirs=${PREFIX}/share/gnome/omf
@@ -47,17 +49,13 @@
MAN8= scrollkeeper-preinstall.8 scrollkeeper-rebuilddb.8 \
scrollkeeper-update.8
-pre-patch:
+post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
- 's|[(]LN_S[)] -f -n|(LN_S) -f|g ; \
- s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
- s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
- s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+ 's|[(]LN_S[)] -f -n|(LN_S) -f|g'
@${REINPLACE_CMD} -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \
${WRKSRC}/libs/scrollkeeper.h.in
-post-patch:
@${REINPLACE_CMD} -e 's|[%][%]PREFIX[%][%]|${PREFIX}|g' \
${WRKSRC}/cl/src/update.c
@${REINPLACE_CMD} -e 's|[%][%]LOCALBASE[%][%]|${LOCALBASE}|g' \
--------------8B564B3DE80F2F32D61B3EF4--
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?3D25E577.ACBD40DA>