diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-07-11 17:16:10 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-07-11 17:16:10 +0000 |
| commit | 19a718ac4c38750e766de7abf027f0491981495d (patch) | |
| tree | 8fad9fa05facfd939ca92589f047e5224dffd236 | |
| parent | 47c68887b223642a73baccd0fa69c8caf7845044 (diff) | |
| download | ports-19a718ac4c38750e766de7abf027f0491981495d.tar.gz ports-19a718ac4c38750e766de7abf027f0491981495d.zip | |
Notes
108 files changed, 537 insertions, 880 deletions
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index 56ce2f249172..064ce401966b 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -15,7 +15,8 @@ DISTNAME= gnome-audio-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_GNOMELIBS= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME}/sounds diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist index e6c26480223f..f0b94e729074 100644 --- a/audio/gnome-audio/pkg-plist +++ b/audio/gnome-audio/pkg-plist @@ -15,4 +15,3 @@ share/gnome/sounds/startup3.wav share/gnome/sounds/warning.wav @dirrm share/gnome/sounds/gtk-events @dirrm share/gnome/sounds/panel -@dirrm share/gnome/sounds diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile index 56ce2f249172..064ce401966b 100644 --- a/audio/gnomeaudio/Makefile +++ b/audio/gnomeaudio/Makefile @@ -15,7 +15,8 @@ DISTNAME= gnome-audio-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_GNOMELIBS= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME}/sounds diff --git a/audio/gnomeaudio/pkg-plist b/audio/gnomeaudio/pkg-plist index e6c26480223f..f0b94e729074 100644 --- a/audio/gnomeaudio/pkg-plist +++ b/audio/gnomeaudio/pkg-plist @@ -15,4 +15,3 @@ share/gnome/sounds/startup3.wav share/gnome/sounds/warning.wav @dirrm share/gnome/sounds/gtk-events @dirrm share/gnome/sounds/panel -@dirrm share/gnome/sounds diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile index 56ce2f249172..064ce401966b 100644 --- a/audio/gnomeaudio2/Makefile +++ b/audio/gnomeaudio2/Makefile @@ -15,7 +15,8 @@ DISTNAME= gnome-audio-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_GNOMELIBS= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME}/sounds diff --git a/audio/gnomeaudio2/pkg-plist b/audio/gnomeaudio2/pkg-plist index e6c26480223f..f0b94e729074 100644 --- a/audio/gnomeaudio2/pkg-plist +++ b/audio/gnomeaudio2/pkg-plist @@ -15,4 +15,3 @@ share/gnome/sounds/startup3.wav share/gnome/sounds/warning.wav @dirrm share/gnome/sounds/gtk-events @dirrm share/gnome/sounds/panel -@dirrm share/gnome/sounds diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index f0a1ace2ae14..64f633ab3621 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -16,27 +16,20 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gda-client.0:${PORTSDIR}/databases/libgda - USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier libgda USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-pthread -L${LOCALBASE}/lib -lintl" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} -pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(GNOME_datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|\$\(GNOME_datadir\)/locale|\$\(prefix\)/share/locale|g' .include <bsd.port.mk> diff --git a/databases/gnome-db/files/patch-po::Makefile.in.in b/databases/gnome-db/files/patch-po::Makefile.in.in deleted file mode 100644 index 490f48af9f3f..000000000000 --- a/databases/gnome-db/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Fri Jun 15 15:38:54 2001 -+++ po/Makefile.in.in Tue Jun 19 02:37:06 2001 -@@ -25,3 +25,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist index 51f76bec637e..89b9103ae5d0 100644 --- a/databases/gnome-db/pkg-plist +++ b/databases/gnome-db/pkg-plist @@ -171,7 +171,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo @dirrm share/gnome/help/gnome-db/C/images @dirrm share/gnome/help/gnome-db/C @dirrm share/gnome/help/gnome-db -@dirrm share/gnome/apps/Applications @dirrm share/doc/gnomedb @dirrm include/libgnomedb-%%VERSION%%/gnome-db @dirrm include/libgnomedb-%%VERSION%% diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile index f0a1ace2ae14..64f633ab3621 100644 --- a/databases/gnomedb/Makefile +++ b/databases/gnomedb/Makefile @@ -16,27 +16,20 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gda-client.0:${PORTSDIR}/databases/libgda - USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier libgda USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-pthread -L${LOCALBASE}/lib -lintl" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} -pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(GNOME_datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|\$\(GNOME_datadir\)/locale|\$\(prefix\)/share/locale|g' .include <bsd.port.mk> diff --git a/databases/gnomedb/files/patch-po::Makefile.in.in b/databases/gnomedb/files/patch-po::Makefile.in.in deleted file mode 100644 index 490f48af9f3f..000000000000 --- a/databases/gnomedb/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Fri Jun 15 15:38:54 2001 -+++ po/Makefile.in.in Tue Jun 19 02:37:06 2001 -@@ -25,3 +25,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/databases/gnomedb/pkg-plist b/databases/gnomedb/pkg-plist index 51f76bec637e..89b9103ae5d0 100644 --- a/databases/gnomedb/pkg-plist +++ b/databases/gnomedb/pkg-plist @@ -171,7 +171,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo @dirrm share/gnome/help/gnome-db/C/images @dirrm share/gnome/help/gnome-db/C @dirrm share/gnome/help/gnome-db -@dirrm share/gnome/apps/Applications @dirrm share/doc/gnomedb @dirrm include/libgnomedb-%%VERSION%%/gnome-db @dirrm include/libgnomedb-%%VERSION%% diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index 0fb8c4353fdf..8c799a3f1655 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -15,12 +15,12 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - bonobo.2:${PORTSDIR}/devel/bonobo +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier gconf bonobo USE_GMAKE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -30,12 +30,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} -pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|share/idl|share/gnome/idl|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|share/idl|share/gnome/idl|g' .include <bsd.port.mk> diff --git a/databases/libgda/files/patch-po::Makefile.in.in b/databases/libgda/files/patch-po::Makefile.in.in deleted file mode 100644 index 3f425ffda3af..000000000000 --- a/databases/libgda/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Wed Jun 13 15:55:50 2001 -+++ po/Makefile.in.in Tue Jun 19 01:14:13 2001 -@@ -25,3 +25,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist index 60028e4563a1..e3b1215bb7f8 100644 --- a/databases/libgda/pkg-plist +++ b/databases/libgda/pkg-plist @@ -206,7 +206,6 @@ share/locale/uk/LC_MESSAGES/libgda.mo @dirrm share/gnome/help/libgda @dirrm share/gnome/gda/templates @dirrm share/gnome/gda -@dirrm share/doc/libgda @dirrm include/libgda-%%VERSION%%/gda++ @dirrm include/libgda-%%VERSION%%/gda @dirrm include/libgda-%%VERSION%% diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile index b6acbed87844..85faa7a61fa5 100644 --- a/deskutils/gnucash/Makefile +++ b/deskutils/gnucash/Makefile @@ -35,9 +35,10 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp USE_REINPLACE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -45,12 +46,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[{]datadir[}]/gnome/|(datadir)/|g ; \ - s|[{]datadir[}]/aclocal|(prefix)/share/aclocal|g ; \ - s|[{]datadir[}]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/deskutils/gnucash/files/patch-configure b/deskutils/gnucash/files/patch-configure index cb1f57af28a6..f5f7a504dc49 100644 --- a/deskutils/gnucash/files/patch-configure +++ b/deskutils/gnucash/files/patch-configure @@ -1,9 +1,17 @@ $FreeBSD$ ---- configure.orig Thu Jan 10 12:57:53 2002 -+++ configure Thu Jan 10 12:59:14 2002 -@@ -9608,7 +9608,7 @@ +--- configure.orig Mon Mar 11 00:50:12 2002 ++++ configure Thu Jul 11 11:16:21 2002 +@@ -5229,6 +5229,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -9608,7 +9609,7 @@ withval="$with_help_prefix" GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash" else @@ -12,7 +20,7 @@ $FreeBSD$ fi -@@ -10128,7 +10128,7 @@ +@@ -10128,7 +10129,7 @@ if test "$prefer_db1" = "yes"; then @@ -21,7 +29,7 @@ $FreeBSD$ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -10168,7 +10168,7 @@ +@@ -10168,7 +10169,7 @@ fi done diff --git a/deskutils/gnucash/files/patch-ltmain.sh b/deskutils/gnucash/files/patch-ltmain.sh deleted file mode 100644 index 022bcf04f826..000000000000 --- a/deskutils/gnucash/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Mon Nov 12 01:53:44 2001 -+++ ltmain.sh Thu Jan 10 13:04:25 2002 -@@ -2408,6 +2408,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 -@@ -4175,10 +4178,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" diff --git a/deskutils/gnucash/files/patch-po::Makefile.in.in b/deskutils/gnucash/files/patch-po::Makefile.in.in deleted file mode 100644 index 5586a26e17f2..000000000000 --- a/deskutils/gnucash/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Fri Apr 27 01:23:42 2001 -+++ po/Makefile.in.in Tue May 22 18:25:29 2001 -@@ -22,3 +22,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/deskutils/gnucash/files/patch-src::gnome::Makefile.in b/deskutils/gnucash/files/patch-src::gnome::Makefile.in new file mode 100644 index 000000000000..2e9afd4bd045 --- /dev/null +++ b/deskutils/gnucash/files/patch-src::gnome::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/gnome/Makefile.in 2002/07/11 09:16:01 1.1 ++++ src/gnome/Makefile.in 2002/07/11 09:16:10 +@@ -226,7 +226,7 @@ + window-report.c + + +-gnomeappdir = ${datadir}/gnome/apps/Applications ++gnomeappdir = ${datadir}/apps/Applications + + gnomeapp_DATA = gnucash.desktop + diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 24bba8ba24af..26d4cac04bb5 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -15,27 +15,22 @@ DIST_SUBDIR= gnome 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> diff --git a/devel/bonobo/files/patch-ac b/devel/bonobo/files/patch-ac deleted file mode 100644 index 727e795ebd2f..000000000000 --- a/devel/bonobo/files/patch-ac +++ /dev/null @@ -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 diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist index 42e8abccacef..140e6e747380 100644 --- a/devel/bonobo/pkg-plist +++ b/devel/bonobo/pkg-plist @@ -244,14 +244,10 @@ share/locale/uk/LC_MESSAGES/bonobo.mo share/locale/wa/LC_MESSAGES/bonobo.mo share/locale/zh_CN/LC_MESSAGES/bonobo.mo share/locale/zh_TW/LC_MESSAGES/bonobo.mo -@dirrm share/gnome/ui @dirrm share/gnome/help/audio_ulaw/C/images @dirrm share/gnome/help/audio_ulaw/C @dirrm share/gnome/help/audio_ulaw @dirrm share/doc/bonobo/libefs @dirrm share/doc/bonobo/bonobo @dirrm share/doc/bonobo -@dirrm lib/bonobo/plugin @dirrm include/gnome-1.0/bonobo -@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index b1966b2f565a..0942f6960dd9 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -16,28 +16,21 @@ DIST_SUBDIR= gnome 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> diff --git a/devel/gconf/files/patch-ab b/devel/gconf/files/patch-ab deleted file mode 100644 index 032c7e5eab94..000000000000 --- a/devel/gconf/files/patch-ab +++ /dev/null @@ -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 ****" diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist index 1194779e1795..a34b17e3c391 100644 --- a/devel/gconf/pkg-plist +++ b/devel/gconf/pkg-plist @@ -61,18 +61,3 @@ share/locale/zh_CN/LC_MESSAGES/GConf.mo @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 diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 0e6e1a2e64dd..1775fc998cf0 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -16,37 +16,29 @@ DIST_SUBDIR= gnome 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> diff --git a/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist index beba41f47813..ec29ffe212d7 100644 --- a/devel/gnome-vfs1/pkg-plist +++ b/devel/gnome-vfs1/pkg-plist @@ -111,10 +111,6 @@ share/locale/tr/LC_MESSAGES/gnome-vfs.mo 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 diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile index 0e6e1a2e64dd..1775fc998cf0 100644 --- a/devel/gnomevfs/Makefile +++ b/devel/gnomevfs/Makefile @@ -16,37 +16,29 @@ DIST_SUBDIR= gnome 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> diff --git a/devel/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist index beba41f47813..ec29ffe212d7 100644 --- a/devel/gnomevfs/pkg-plist +++ b/devel/gnomevfs/pkg-plist @@ -111,10 +111,6 @@ share/locale/tr/LC_MESSAGES/gnome-vfs.mo 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 diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 21990853de6c..8ce5faacf802 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -14,12 +14,11 @@ MASTER_SITE_SUBDIR= stable/sources/libglade MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomedb.0:${PORTSDIR}/databases/gnomedb - USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier gnomedb GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab index b176d42e4de6..244d49bd8e05 100644 --- a/devel/libglade/files/patch-ab +++ b/devel/libglade/files/patch-ab @@ -1,34 +1,20 @@ $FreeBSD$ ---- Makefile.in.orig Fri Sep 7 06:00:35 2001 -+++ Makefile.in Tue Sep 11 15:11:04 2001 -@@ -34,7 +34,7 @@ - includedir = @includedir@ - oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/pkgconfig - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . - -@@ -167,15 +167,15 @@ +--- Makefile.in.orig Sat Jul 6 23:09:19 2002 ++++ Makefile.in Sat Jul 6 23:12:35 2002 +@@ -167,12 +167,12 @@ bin_SCRIPTS = libglade-config libglade-xgettext noinst_PROGRAMS = test-libglade test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS) -SUBDIRS = intl macros glade doc +SUBDIRS = intl macros glade --m4datadir = $(datadir)/aclocal -+m4datadir = $(prefix)/share/aclocal + m4datadir = $(prefix)/share/aclocal m4data_DATA = libglade.m4 -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = libgladeConf.sh --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libglade.pc $(libglade_gnome_pc) $(libglade_bonobo_pc) \ - $(libglade_gnomedb_pc) - + pkgconfigdir = $(prefix)/libdata/pkgconfig diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 3905b08914b8..7f6472c36f6b 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -19,23 +19,20 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt 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> diff --git a/devel/oaf/files/patch-aa b/devel/oaf/files/patch-aa index 1d0c2fab43c1..e0caa8a8ec2c 100644 --- a/devel/oaf/files/patch-aa +++ b/devel/oaf/files/patch-aa @@ -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 diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index d22d8ded7998..7452cec1b423 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -32,16 +32,17 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi USE_X_PREFIX= yes USE_AUTOMAKE= yes USE_GMAKE= yes -USE_GTK= yes +USE_REINPLACE= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 gnomehier WANT_GNOME= yes AUTOMAKE= ${WRKSRC}/autogen.sh && ${FIXME} -CONFIGURE_ARGS= --datadir=${PREFIX}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" MAKEFILE= GNUmakefile -FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \ - 's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \ - s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g' +FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \ + s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE} .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_GNOME @@ -51,9 +52,12 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) -USE_GNOME= yes +# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf + +.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!="" +USE_GNOME+= gnomeprint gal gnomevfs CONFIGURE_ARGS+=--enable-gnome +PKGNAMESUFFIX= -gnome .endif post-patch: @@ -68,11 +72,9 @@ pre-configure: post-install: @${CAT} ${PKGMESSAGE} -.if defined(HAVE_GNOME) @${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \ ${PREFIX}/share/gnome/apps/Applications/abiword.desktop @${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \ ${PREFIX}/share/gnome/pixmaps/abiword_48.png -.endif .include <bsd.port.post.mk> diff --git a/editors/AbiWord/pkg-plist b/editors/AbiWord/pkg-plist index 0d6fc9c22a39..5be4b8a8019e 100644 --- a/editors/AbiWord/pkg-plist +++ b/editors/AbiWord/pkg-plist @@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif share/AbiSuite/icons/abiword_48.xpm %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm share/AbiSuite/templates/normal.awt -%%GNOME:%%share/gnome/apps/Applications/abiword.desktop -%%GNOME:%%share/gnome/pixmaps/abiword_48.png +share/gnome/apps/Applications/abiword.desktop +share/gnome/pixmaps/abiword_48.png @dirrm share/AbiSuite/templates @dirrm share/AbiSuite/icons @dirrm share/AbiSuite/fonts diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index d22d8ded7998..7452cec1b423 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -32,16 +32,17 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi USE_X_PREFIX= yes USE_AUTOMAKE= yes USE_GMAKE= yes -USE_GTK= yes +USE_REINPLACE= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 gnomehier WANT_GNOME= yes AUTOMAKE= ${WRKSRC}/autogen.sh && ${FIXME} -CONFIGURE_ARGS= --datadir=${PREFIX}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" MAKEFILE= GNUmakefile -FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \ - 's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \ - s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g' +FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \ + s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE} .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_GNOME @@ -51,9 +52,12 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) -USE_GNOME= yes +# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf + +.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!="" +USE_GNOME+= gnomeprint gal gnomevfs CONFIGURE_ARGS+=--enable-gnome +PKGNAMESUFFIX= -gnome .endif post-patch: @@ -68,11 +72,9 @@ pre-configure: post-install: @${CAT} ${PKGMESSAGE} -.if defined(HAVE_GNOME) @${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \ ${PREFIX}/share/gnome/apps/Applications/abiword.desktop @${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \ ${PREFIX}/share/gnome/pixmaps/abiword_48.png -.endif .include <bsd.port.post.mk> diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist index 0d6fc9c22a39..5be4b8a8019e 100644 --- a/editors/AbiWord2/pkg-plist +++ b/editors/AbiWord2/pkg-plist @@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif share/AbiSuite/icons/abiword_48.xpm %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm share/AbiSuite/templates/normal.awt -%%GNOME:%%share/gnome/apps/Applications/abiword.desktop -%%GNOME:%%share/gnome/pixmaps/abiword_48.png +share/gnome/apps/Applications/abiword.desktop +share/gnome/pixmaps/abiword_48.png @dirrm share/AbiSuite/templates @dirrm share/AbiSuite/icons @dirrm share/AbiSuite/fonts diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index d22d8ded7998..7452cec1b423 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -32,16 +32,17 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi USE_X_PREFIX= yes USE_AUTOMAKE= yes USE_GMAKE= yes -USE_GTK= yes +USE_REINPLACE= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 gnomehier WANT_GNOME= yes AUTOMAKE= ${WRKSRC}/autogen.sh && ${FIXME} -CONFIGURE_ARGS= --datadir=${PREFIX}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" MAKEFILE= GNUmakefile -FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \ - 's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \ - s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g' +FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \ + s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE} .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_GNOME @@ -51,9 +52,12 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) -USE_GNOME= yes +# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf + +.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!="" +USE_GNOME+= gnomeprint gal gnomevfs CONFIGURE_ARGS+=--enable-gnome +PKGNAMESUFFIX= -gnome .endif post-patch: @@ -68,11 +72,9 @@ pre-configure: post-install: @${CAT} ${PKGMESSAGE} -.if defined(HAVE_GNOME) @${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \ ${PREFIX}/share/gnome/apps/Applications/abiword.desktop @${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \ ${PREFIX}/share/gnome/pixmaps/abiword_48.png -.endif .include <bsd.port.post.mk> diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist index 0d6fc9c22a39..5be4b8a8019e 100644 --- a/editors/abiword-devel/pkg-plist +++ b/editors/abiword-devel/pkg-plist @@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif share/AbiSuite/icons/abiword_48.xpm %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm share/AbiSuite/templates/normal.awt -%%GNOME:%%share/gnome/apps/Applications/abiword.desktop -%%GNOME:%%share/gnome/pixmaps/abiword_48.png +share/gnome/apps/Applications/abiword.desktop +share/gnome/pixmaps/abiword_48.png @dirrm share/AbiSuite/templates @dirrm share/AbiSuite/icons @dirrm share/AbiSuite/fonts diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index d22d8ded7998..7452cec1b423 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -32,16 +32,17 @@ WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi USE_X_PREFIX= yes USE_AUTOMAKE= yes USE_GMAKE= yes -USE_GTK= yes +USE_REINPLACE= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 gnomehier WANT_GNOME= yes AUTOMAKE= ${WRKSRC}/autogen.sh && ${FIXME} -CONFIGURE_ARGS= --datadir=${PREFIX}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" MAKEFILE= GNUmakefile -FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \ - 's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \ - s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g' +FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \ + s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE} .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_GNOME @@ -51,9 +52,12 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) -USE_GNOME= yes +# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf + +.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!="" +USE_GNOME+= gnomeprint gal gnomevfs CONFIGURE_ARGS+=--enable-gnome +PKGNAMESUFFIX= -gnome .endif post-patch: @@ -68,11 +72,9 @@ pre-configure: post-install: @${CAT} ${PKGMESSAGE} -.if defined(HAVE_GNOME) @${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \ ${PREFIX}/share/gnome/apps/Applications/abiword.desktop @${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \ ${PREFIX}/share/gnome/pixmaps/abiword_48.png -.endif .include <bsd.port.post.mk> diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist index 0d6fc9c22a39..5be4b8a8019e 100644 --- a/editors/abiword/pkg-plist +++ b/editors/abiword/pkg-plist @@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif share/AbiSuite/icons/abiword_48.xpm %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm share/AbiSuite/templates/normal.awt -%%GNOME:%%share/gnome/apps/Applications/abiword.desktop -%%GNOME:%%share/gnome/pixmaps/abiword_48.png +share/gnome/apps/Applications/abiword.desktop +share/gnome/pixmaps/abiword_48.png @dirrm share/AbiSuite/templates @dirrm share/AbiSuite/icons @dirrm share/AbiSuite/fonts diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index b6acbed87844..85faa7a61fa5 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -35,9 +35,10 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp USE_REINPLACE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -45,12 +46,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[{]datadir[}]/gnome/|(datadir)/|g ; \ - s|[{]datadir[}]/aclocal|(prefix)/share/aclocal|g ; \ - s|[{]datadir[}]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/finance/gnucash-devel/files/patch-configure b/finance/gnucash-devel/files/patch-configure index cb1f57af28a6..f5f7a504dc49 100644 --- a/finance/gnucash-devel/files/patch-configure +++ b/finance/gnucash-devel/files/patch-configure @@ -1,9 +1,17 @@ $FreeBSD$ ---- configure.orig Thu Jan 10 12:57:53 2002 -+++ configure Thu Jan 10 12:59:14 2002 -@@ -9608,7 +9608,7 @@ +--- configure.orig Mon Mar 11 00:50:12 2002 ++++ configure Thu Jul 11 11:16:21 2002 +@@ -5229,6 +5229,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -9608,7 +9609,7 @@ withval="$with_help_prefix" GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash" else @@ -12,7 +20,7 @@ $FreeBSD$ fi -@@ -10128,7 +10128,7 @@ +@@ -10128,7 +10129,7 @@ if test "$prefer_db1" = "yes"; then @@ -21,7 +29,7 @@ $FreeBSD$ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -10168,7 +10168,7 @@ +@@ -10168,7 +10169,7 @@ fi done diff --git a/finance/gnucash-devel/files/patch-ltmain.sh b/finance/gnucash-devel/files/patch-ltmain.sh deleted file mode 100644 index 022bcf04f826..000000000000 --- a/finance/gnucash-devel/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Mon Nov 12 01:53:44 2001 -+++ ltmain.sh Thu Jan 10 13:04:25 2002 -@@ -2408,6 +2408,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 -@@ -4175,10 +4178,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" diff --git a/finance/gnucash-devel/files/patch-po::Makefile.in.in b/finance/gnucash-devel/files/patch-po::Makefile.in.in deleted file mode 100644 index 5586a26e17f2..000000000000 --- a/finance/gnucash-devel/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Fri Apr 27 01:23:42 2001 -+++ po/Makefile.in.in Tue May 22 18:25:29 2001 -@@ -22,3 +22,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/finance/gnucash-devel/files/patch-src::gnome::Makefile.in b/finance/gnucash-devel/files/patch-src::gnome::Makefile.in new file mode 100644 index 000000000000..2e9afd4bd045 --- /dev/null +++ b/finance/gnucash-devel/files/patch-src::gnome::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/gnome/Makefile.in 2002/07/11 09:16:01 1.1 ++++ src/gnome/Makefile.in 2002/07/11 09:16:10 +@@ -226,7 +226,7 @@ + window-report.c + + +-gnomeappdir = ${datadir}/gnome/apps/Applications ++gnomeappdir = ${datadir}/apps/Applications + + gnomeapp_DATA = gnucash.desktop + diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index b6acbed87844..85faa7a61fa5 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -35,9 +35,10 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp USE_REINPLACE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -45,12 +46,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[{]datadir[}]/gnome/|(datadir)/|g ; \ - s|[{]datadir[}]/aclocal|(prefix)/share/aclocal|g ; \ - s|[{]datadir[}]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure index cb1f57af28a6..f5f7a504dc49 100644 --- a/finance/gnucash/files/patch-configure +++ b/finance/gnucash/files/patch-configure @@ -1,9 +1,17 @@ $FreeBSD$ ---- configure.orig Thu Jan 10 12:57:53 2002 -+++ configure Thu Jan 10 12:59:14 2002 -@@ -9608,7 +9608,7 @@ +--- configure.orig Mon Mar 11 00:50:12 2002 ++++ configure Thu Jul 11 11:16:21 2002 +@@ -5229,6 +5229,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -9608,7 +9609,7 @@ withval="$with_help_prefix" GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash" else @@ -12,7 +20,7 @@ $FreeBSD$ fi -@@ -10128,7 +10128,7 @@ +@@ -10128,7 +10129,7 @@ if test "$prefer_db1" = "yes"; then @@ -21,7 +29,7 @@ $FreeBSD$ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -10168,7 +10168,7 @@ +@@ -10168,7 +10169,7 @@ fi done diff --git a/finance/gnucash/files/patch-ltmain.sh b/finance/gnucash/files/patch-ltmain.sh deleted file mode 100644 index 022bcf04f826..000000000000 --- a/finance/gnucash/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Mon Nov 12 01:53:44 2001 -+++ ltmain.sh Thu Jan 10 13:04:25 2002 -@@ -2408,6 +2408,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 -@@ -4175,10 +4178,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" diff --git a/finance/gnucash/files/patch-po::Makefile.in.in b/finance/gnucash/files/patch-po::Makefile.in.in deleted file mode 100644 index 5586a26e17f2..000000000000 --- a/finance/gnucash/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Fri Apr 27 01:23:42 2001 -+++ po/Makefile.in.in Tue May 22 18:25:29 2001 -@@ -22,3 +22,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/finance/gnucash/files/patch-src::gnome::Makefile.in b/finance/gnucash/files/patch-src::gnome::Makefile.in new file mode 100644 index 000000000000..2e9afd4bd045 --- /dev/null +++ b/finance/gnucash/files/patch-src::gnome::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/gnome/Makefile.in 2002/07/11 09:16:01 1.1 ++++ src/gnome/Makefile.in 2002/07/11 09:16:10 +@@ -226,7 +226,7 @@ + window-report.c + + +-gnomeappdir = ${datadir}/gnome/apps/Applications ++gnomeappdir = ${datadir}/apps/Applications + + gnomeapp_DATA = gnucash.desktop + diff --git a/graphics/gnomecanvas/Makefile b/graphics/gnomecanvas/Makefile index 5158620ac64b..24ee37d1b124 100644 --- a/graphics/gnomecanvas/Makefile +++ b/graphics/gnomecanvas/Makefile @@ -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 diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile index 74dfa152e0a1..02fdae068378 100644 --- a/lang/gnomebasic/Makefile +++ b/lang/gnomebasic/Makefile @@ -16,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs gnomeprint USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -26,8 +27,5 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ pre-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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist index 94a1c66557d2..b3270960e35a 100644 --- a/mail/evolution-devel/pkg-plist +++ b/mail/evolution-devel/pkg-plist @@ -1205,6 +1205,8 @@ share/locale/vi/LC_MESSAGES/evolution.mo share/locale/uk/LC_MESSAGES/evolution.mo share/locale/zh_CN/LC_MESSAGES/evolution.mo share/locale/zh_TW/LC_MESSAGES/evolution.mo +@dirrm share/doc/evolution-cal-util +@dirrm share/doc/evolution-cal-client @dirrm share/gnome/omf/evolution @dirrm share/gnome/libical-evolution/zoneinfo/Pacific @dirrm share/gnome/libical-evolution/zoneinfo/Indian diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 94a1c66557d2..b3270960e35a 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -1205,6 +1205,8 @@ share/locale/vi/LC_MESSAGES/evolution.mo share/locale/uk/LC_MESSAGES/evolution.mo share/locale/zh_CN/LC_MESSAGES/evolution.mo share/locale/zh_TW/LC_MESSAGES/evolution.mo +@dirrm share/doc/evolution-cal-util +@dirrm share/doc/evolution-cal-client @dirrm share/gnome/omf/evolution @dirrm share/gnome/libical-evolution/zoneinfo/Pacific @dirrm share/gnome/libical-evolution/zoneinfo/Indian diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 38eac4e72346..9edf58e312bb 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -24,7 +24,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal USE_PYTHON= yes USE_REINPLACE= yes USE_LIBTOOL= yes @@ -36,12 +37,9 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION}-bonobo -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' post-install: .for dir in share/gnome lib diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 38eac4e72346..9edf58e312bb 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -24,7 +24,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal USE_PYTHON= yes USE_REINPLACE= yes USE_LIBTOOL= yes @@ -36,12 +37,9 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION}-bonobo -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' post-install: .for dir in share/gnome lib diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 82488c817e93..7f40bb5df4d4 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -19,7 +19,8 @@ LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal USE_PYTHON= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes @@ -36,11 +37,8 @@ PLIST_SUB= VERSION="${PORTVERSION}" post-extract: @cd ${PORTSDIR}/math/gnumeric && ${MAKE} patch -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> diff --git a/math/guppi/files/patch-Makefile.in b/math/guppi/files/patch-Makefile.in index b8891ef7e9f9..de132b24be95 100644 --- a/math/guppi/files/patch-Makefile.in +++ b/math/guppi/files/patch-Makefile.in @@ -1,24 +1,18 @@ $FreeBSD$ ---- Makefile.in.orig Fri Nov 23 18:19:00 2001 -+++ Makefile.in Fri Nov 23 18:19:44 2001 -@@ -205,12 +205,12 @@ +--- Makefile.in.orig Thu Jul 11 04:03:22 2002 ++++ Makefile.in Thu Jul 11 04:04:37 2002 +@@ -197,7 +197,7 @@ #appdir = $(datadir)/apps/Applications #app_DATA = guppi.desktop -confexecdir = $(libdir) -+confexecdir = $(prefix)/etc ++confexecdir = $(sysconfdir) confexec_DATA = libguppiConf.sh CLEANFILES = libguppiConf.sh xml-i18n-extract xml-i18n-merge xml-i18n-update - --aclocaldir = $(datadir)/aclocal -+aclocaldir = $(prefix)/share/aclocal - aclocal_DATA = libguppi.m4 - - EXTRA_DIST = ChangeLog README AUTHORS NEWS BIBLIOGRAPHY libguppiConf.sh.in libguppi.m4 xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in -@@ -545,10 +545,10 @@ +@@ -537,10 +537,10 @@ libguppiConf.sh: libguppiConf.sh.in Makefile diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile index 611d36d7725a..509894ea82ae 100644 --- a/misc/gnomehier/Makefile +++ b/misc/gnomehier/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomehier PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= # none DISTFILES= # none @@ -17,6 +17,8 @@ MAINTAINER= sobomax@FreeBSD.org NO_BUILD= yes NO_WRKSUBDIR= yes +USE_X_PREFIX= yes + do-fetch: @${DO_NADA} diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist index df6ed94ea6fe..7ea4200f623e 100644 --- a/misc/gnomehier/files/dirlist +++ b/misc/gnomehier/files/dirlist @@ -17,6 +17,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/eog 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/PostSession 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/sound/events 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 lib/vfs/modules libdata/bonobo libdata/bonobo/servers -libexec/rep libexec/sawfish share/doc/libgda share/gnome @@ -243,3 +242,5 @@ share/gnome/xbill/cursors share/gnome/xbill/pixmaps share/gnome/xmodmap share/sawfish +share/sawfish/sounds +share/sawfish/themes diff --git a/misc/gnomehier/pkg-plist b/misc/gnomehier/pkg-plist index 35747d37c684..97a6aba28942 100644 --- a/misc/gnomehier/pkg-plist +++ b/misc/gnomehier/pkg-plist @@ -17,6 +17,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/eog/.keep_me 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/gdm/Sessions/.keep_me 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/.keep_me 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,10 @@ share/gnome/xbill/cursors/.keep_me 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 +share/sawfish/sounds/.keep_me +share/sawfish/themes/.keep_me +@dirrm share/sawfish/themes +@dirrm share/sawfish/sounds @dirrm share/sawfish @dirrm share/gnome/xmodmap @dirrm share/gnome/xbill/pixmaps @@ -442,7 +437,6 @@ share/themes/Redmond95/.keep_me @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 +455,6 @@ share/themes/Redmond95/.keep_me @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 +462,7 @@ share/themes/Redmond95/.keep_me @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 +470,7 @@ share/themes/Redmond95/.keep_me @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 diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index cf604bc06b3d..ad5fb693ca13 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -20,17 +20,15 @@ LIB_DEPENDS= gpilotd.1:${PORTSDIR}/palm/gnomepilot USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs libglade gnomevfs USE_LIBTOOL= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} 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> diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index f571d0ac1661..573503503eeb 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -22,7 +22,9 @@ LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs libglade gnomevfs libpanel \ + libcapplet USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} @@ -31,11 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gpilot-install-file.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> diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist index bfcec3dcf4d4..21f584b2ba1e 100644 --- a/palm/gnome-pilot/pkg-plist +++ b/palm/gnome-pilot/pkg-plist @@ -78,9 +78,5 @@ share/locale/tr/LC_MESSAGES/gnome-pilot.mo share/locale/uk/LC_MESSAGES/gnome-pilot.mo share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo @dirrm share/gnome/gnome-pilot/glade -@dirrm share/gnome/gnome-pilot/conduits -@dirrm share/gnome/gnome-pilot -@dirrm lib/gnome-pilot/conduits -@dirrm lib/gnome-pilot @dirrm include/libgpilotdCM @dirrm include/gpilotd diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile index cf604bc06b3d..ad5fb693ca13 100644 --- a/palm/gnomepilot-conduits/Makefile +++ b/palm/gnomepilot-conduits/Makefile @@ -20,17 +20,15 @@ LIB_DEPENDS= gpilotd.1:${PORTSDIR}/palm/gnomepilot USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs libglade gnomevfs USE_LIBTOOL= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} 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> diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile index cf604bc06b3d..ad5fb693ca13 100644 --- a/palm/gnomepilot-conduits2/Makefile +++ b/palm/gnomepilot-conduits2/Makefile @@ -20,17 +20,15 @@ LIB_DEPENDS= gpilotd.1:${PORTSDIR}/palm/gnomepilot USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs libglade gnomevfs USE_LIBTOOL= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} 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> diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile index f571d0ac1661..573503503eeb 100644 --- a/palm/gnomepilot/Makefile +++ b/palm/gnomepilot/Makefile @@ -22,7 +22,9 @@ LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs libglade gnomevfs libpanel \ + libcapplet USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} @@ -31,11 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gpilot-install-file.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> diff --git a/palm/gnomepilot/pkg-plist b/palm/gnomepilot/pkg-plist index bfcec3dcf4d4..21f584b2ba1e 100644 --- a/palm/gnomepilot/pkg-plist +++ b/palm/gnomepilot/pkg-plist @@ -78,9 +78,5 @@ share/locale/tr/LC_MESSAGES/gnome-pilot.mo share/locale/uk/LC_MESSAGES/gnome-pilot.mo share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo @dirrm share/gnome/gnome-pilot/glade -@dirrm share/gnome/gnome-pilot/conduits -@dirrm share/gnome/gnome-pilot -@dirrm lib/gnome-pilot/conduits -@dirrm lib/gnome-pilot @dirrm include/libgpilotdCM @dirrm include/gpilotd diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index f571d0ac1661..573503503eeb 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -22,7 +22,9 @@ LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs libglade gnomevfs libpanel \ + libcapplet USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} @@ -31,11 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gpilot-install-file.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> diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist index bfcec3dcf4d4..21f584b2ba1e 100644 --- a/palm/gnomepilot2/pkg-plist +++ b/palm/gnomepilot2/pkg-plist @@ -78,9 +78,5 @@ share/locale/tr/LC_MESSAGES/gnome-pilot.mo share/locale/uk/LC_MESSAGES/gnome-pilot.mo share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo @dirrm share/gnome/gnome-pilot/glade -@dirrm share/gnome/gnome-pilot/conduits -@dirrm share/gnome/gnome-pilot -@dirrm lib/gnome-pilot/conduits -@dirrm lib/gnome-pilot @dirrm include/libgpilotdCM @dirrm include/gpilotd diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 7eb9305f97f3..9c270e8e1a3a 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -25,18 +25,16 @@ USE_BZIP2= yes 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 diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist index 4e2857d85f38..e05ba7c0333b 100644 --- a/print/gnome-print/pkg-plist +++ b/print/gnome-print/pkg-plist @@ -118,5 +118,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-print.mo @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 diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index 7eb9305f97f3..9c270e8e1a3a 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -25,18 +25,16 @@ USE_BZIP2= yes 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 diff --git a/print/gnomeprint/pkg-plist b/print/gnomeprint/pkg-plist index 4e2857d85f38..e05ba7c0333b 100644 --- a/print/gnomeprint/pkg-plist +++ b/print/gnomeprint/pkg-plist @@ -118,5 +118,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-print.mo @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 diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 06b89691fae7..a9fc227cff77 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -16,23 +16,17 @@ DIST_SUBDIR= gnome 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 -INSTALLS_SHLIB= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomecanvas gnomevfs libcapplet 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> diff --git a/sysutils/gnome-control-center1/files/patch-bn b/sysutils/gnome-control-center1/files/patch-bn index 294e18fe95ed..737c98cab630 100644 --- a/sysutils/gnome-control-center1/files/patch-bn +++ b/sysutils/gnome-control-center1/files/patch-bn @@ -1,16 +1,54 @@ ---- 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 @@ + +$FreeBSD$ + +--- control-center/Makefile.in.orig Wed Jul 10 16:48:34 2002 ++++ control-center/Makefile.in Wed Jul 10 16:51:37 2002 +@@ -208,7 +208,7 @@ + sys_in_files = gnomecc.desktop.in + sys_DATA = $(sys_in_files:.desktop.in=.desktop) -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = cappletConf.sh -@@ -168,3 +168,3 @@ + + libcapplet_la_SOURCES = \ +@@ -218,7 +218,7 @@ + $(CORBA_SRCLIST) + -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' \ + + libcappletincludedir = $(includedir)/libcapplet1 +@@ -522,12 +522,10 @@ + check: check-am + installcheck-am: + installcheck: installcheck-am +-install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \ +- install-confexecDATA ++install-exec-am: install-binPROGRAMS + install-exec: install-exec-am + +-install-data-am: install-appiconDATA install-splashDATA install-sysDATA \ +- install-libcappletincludeHEADERS ++install-data-am: install-appiconDATA install-splashDATA install-sysDATA + install-data: install-data-am + + install-am: all-am +@@ -546,7 +544,6 @@ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(appicondir) $(DESTDIR)$(confexecdir) \ + $(DESTDIR)$(splashdir) $(DESTDIR)$(sysdir) \ +- $(DESTDIR)$(libcappletincludedir) + + + mostlyclean-generic: +@@ -592,6 +589,7 @@ + clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ + uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ + distclean-compile clean-compile maintainer-clean-compile \ + -e 's?\@VERSION\@?$(VERSION)?g' \ - < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \ + mostlyclean-libtool distclean-libtool clean-libtool \ + maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ + clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ diff --git a/sysutils/gnome-control-center1/files/patch-idl::Makefile.in b/sysutils/gnome-control-center1/files/patch-idl::Makefile.in new file mode 100644 index 000000000000..8bc65dc999aa --- /dev/null +++ b/sysutils/gnome-control-center1/files/patch-idl::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- idl/Makefile.in 2002/07/10 13:49:41 1.1 ++++ idl/Makefile.in 2002/07/10 13:50:18 +@@ -251,7 +251,7 @@ + install-exec-am: + install-exec: install-exec-am + +-install-data-am: install-gnomeccgnorbaDATA install-idlDATA ++install-data-am: install-gnomeccgnorbaDATA + install-data: install-data-am + + install-am: all-am diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist index 851c8c41c64e..bea2205dc885 100644 --- a/sysutils/gnome-control-center1/pkg-plist +++ b/sysutils/gnome-control-center1/pkg-plist @@ -10,11 +10,6 @@ bin/ui-properties bin/url-properties bin/wm-properties-capplet etc/CORBA/servers/gnomecc.gnorba -etc/cappletConf.sh -include/libcapplet1/capplet-widget.h -lib/libcapplet.a -lib/libcapplet.so -lib/libcapplet.so.5 share/gnome/apps/Settings/Desktop/.directory share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop @@ -130,7 +125,6 @@ share/gnome/help/control-center/eu/stylesheet-images/up.gif share/gnome/help/control-center/eu/stylesheet-images/warning.gif share/gnome/help/control-center/eu/topic.dat share/gnome/help/control-center/eu/usage.html -share/gnome/idl/control-center.idl share/gnome/omf/control-center/control-center-C.omf share/gnome/omf/control-center/control-center-eu.omf share/gnome/pixmaps/ccsplash.png @@ -177,7 +171,6 @@ share/locale/uk/LC_MESSAGES/control-center.mo 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 +180,6 @@ share/locale/zh_TW/LC_MESSAGES/control-center.mo @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 diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index 06b89691fae7..a9fc227cff77 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -16,23 +16,17 @@ DIST_SUBDIR= gnome 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 -INSTALLS_SHLIB= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomecanvas gnomevfs libcapplet 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> diff --git a/sysutils/gnomecontrolcenter/files/patch-bn b/sysutils/gnomecontrolcenter/files/patch-bn index 294e18fe95ed..737c98cab630 100644 --- a/sysutils/gnomecontrolcenter/files/patch-bn +++ b/sysutils/gnomecontrolcenter/files/patch-bn @@ -1,16 +1,54 @@ ---- 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 @@ + +$FreeBSD$ + +--- control-center/Makefile.in.orig Wed Jul 10 16:48:34 2002 ++++ control-center/Makefile.in Wed Jul 10 16:51:37 2002 +@@ -208,7 +208,7 @@ + sys_in_files = gnomecc.desktop.in + sys_DATA = $(sys_in_files:.desktop.in=.desktop) -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = cappletConf.sh -@@ -168,3 +168,3 @@ + + libcapplet_la_SOURCES = \ +@@ -218,7 +218,7 @@ + $(CORBA_SRCLIST) + -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' \ + + libcappletincludedir = $(includedir)/libcapplet1 +@@ -522,12 +522,10 @@ + check: check-am + installcheck-am: + installcheck: installcheck-am +-install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \ +- install-confexecDATA ++install-exec-am: install-binPROGRAMS + install-exec: install-exec-am + +-install-data-am: install-appiconDATA install-splashDATA install-sysDATA \ +- install-libcappletincludeHEADERS ++install-data-am: install-appiconDATA install-splashDATA install-sysDATA + install-data: install-data-am + + install-am: all-am +@@ -546,7 +544,6 @@ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(appicondir) $(DESTDIR)$(confexecdir) \ + $(DESTDIR)$(splashdir) $(DESTDIR)$(sysdir) \ +- $(DESTDIR)$(libcappletincludedir) + + + mostlyclean-generic: +@@ -592,6 +589,7 @@ + clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ + uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ + distclean-compile clean-compile maintainer-clean-compile \ + -e 's?\@VERSION\@?$(VERSION)?g' \ - < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \ + mostlyclean-libtool distclean-libtool clean-libtool \ + maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ + clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ diff --git a/sysutils/gnomecontrolcenter/files/patch-idl::Makefile.in b/sysutils/gnomecontrolcenter/files/patch-idl::Makefile.in new file mode 100644 index 000000000000..8bc65dc999aa --- /dev/null +++ b/sysutils/gnomecontrolcenter/files/patch-idl::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- idl/Makefile.in 2002/07/10 13:49:41 1.1 ++++ idl/Makefile.in 2002/07/10 13:50:18 +@@ -251,7 +251,7 @@ + install-exec-am: + install-exec: install-exec-am + +-install-data-am: install-gnomeccgnorbaDATA install-idlDATA ++install-data-am: install-gnomeccgnorbaDATA + install-data: install-data-am + + install-am: all-am diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist index 851c8c41c64e..bea2205dc885 100644 --- a/sysutils/gnomecontrolcenter/pkg-plist +++ b/sysutils/gnomecontrolcenter/pkg-plist @@ -10,11 +10,6 @@ bin/ui-properties bin/url-properties bin/wm-properties-capplet etc/CORBA/servers/gnomecc.gnorba -etc/cappletConf.sh -include/libcapplet1/capplet-widget.h -lib/libcapplet.a -lib/libcapplet.so -lib/libcapplet.so.5 share/gnome/apps/Settings/Desktop/.directory share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop @@ -130,7 +125,6 @@ share/gnome/help/control-center/eu/stylesheet-images/up.gif share/gnome/help/control-center/eu/stylesheet-images/warning.gif share/gnome/help/control-center/eu/topic.dat share/gnome/help/control-center/eu/usage.html -share/gnome/idl/control-center.idl share/gnome/omf/control-center/control-center-C.omf share/gnome/omf/control-center/control-center-eu.omf share/gnome/pixmaps/ccsplash.png @@ -177,7 +171,6 @@ share/locale/uk/LC_MESSAGES/control-center.mo 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 +180,6 @@ share/locale/zh_TW/LC_MESSAGES/control-center.mo @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 diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile index 174278d49b58..8e4865408405 100644 --- a/sysutils/medusa/Makefile +++ b/sysutils/medusa/Makefile @@ -17,7 +17,8 @@ MAINTAINER= gnome@FreeBSD.org USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier gnomevfs USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -28,11 +29,8 @@ MAN5= medusa.conf.5 medusa-file-index-stoplist.5 MAN7= medusa-search-uri.7 MAN8= medusa-searchd.8 -pre-patch: +post-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' .include <bsd.port.mk> diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index dd21b7055e09..9cbb4301900c 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -33,6 +33,8 @@ USE_GMAKE= yes 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 @@ MAN7= scrollkeeper.7 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' \ diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile index 9d584153172a..59b5948ac8ee 100644 --- a/www/glibwww/Makefile +++ b/www/glibwww/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomelibs USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index e4986cf48449..9c97cee7a510 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -14,29 +14,23 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ - pspell.4:${PORTSDIR}/textproc/pspell \ - gal.19:${PORTSDIR}/x11-toolkits/gal \ - ghttp.1:${PORTSDIR}/www/libghttp +LIB_DEPENDS= pspell.4:${PORTSDIR}/textproc/pspell USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier glibwww gal ghttp libcapplet INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_REINPLACE= yes -CONFIGURE_ARGS= --with-gconf=yes \ - --disable-gtk-doc +CONFIGURE_ARGS= --with-gconf=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index e4986cf48449..9c97cee7a510 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -14,29 +14,23 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ - pspell.4:${PORTSDIR}/textproc/pspell \ - gal.19:${PORTSDIR}/x11-toolkits/gal \ - ghttp.1:${PORTSDIR}/www/libghttp +LIB_DEPENDS= pspell.4:${PORTSDIR}/textproc/pspell USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier glibwww gal ghttp libcapplet INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_REINPLACE= yes -CONFIGURE_ARGS= --with-gconf=yes \ - --disable-gtk-doc +CONFIGURE_ARGS= --with-gconf=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index e4986cf48449..9c97cee7a510 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -14,29 +14,23 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ - pspell.4:${PORTSDIR}/textproc/pspell \ - gal.19:${PORTSDIR}/x11-toolkits/gal \ - ghttp.1:${PORTSDIR}/www/libghttp +LIB_DEPENDS= pspell.4:${PORTSDIR}/textproc/pspell USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier glibwww gal ghttp libcapplet INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_REINPLACE= yes -CONFIGURE_ARGS= --with-gconf=yes \ - --disable-gtk-doc +CONFIGURE_ARGS= --with-gconf=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index a69578f38cc1..4d5e7a70f439 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ freetype.9:${PORTSDIR}/print/freetype2 \ eel.0:${PORTSDIR}/x11-toolkits/eel -RUN_DEPENDS= ${X11BASE}/share/gnome/ui/nautilus-galeon-view-ui.xml:${PORTSDIR}/www/galeon +#RUN_DEPENDS= ${X11BASE}/share/gnome/ui/nautilus-galeon-view-ui.xml:${PORTSDIR}/www/galeon .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so.0) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam @@ -39,7 +39,8 @@ RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZIL USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier gnomecore INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ @@ -73,11 +74,8 @@ pre-extract: @${ECHO_MSG} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA." .endif -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> diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 7c27654f0a88..4b5f6dd5ed54 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -1102,35 +1102,11 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/html @dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/common @dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29 -@dirrm share/gnome/sgml/docbook/gnome-customization-0.1 -@dirrm share/gnome/sgml/docbook -@dirrm share/gnome/sgml -@dirrm share/gnome/pixmaps/nautilus/throbber -@dirrm share/gnome/pixmaps/nautilus/tahoe -@dirrm share/gnome/pixmaps/nautilus/sierra -@dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces -@dirrm share/gnome/pixmaps/nautilus/gnome/throbber -@dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces -@dirrm share/gnome/pixmaps/nautilus/gnome -@dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber -@dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces -@dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds -@dirrm share/gnome/pixmaps/nautilus/crux_teal -@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber -@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces -@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds -@dirrm share/gnome/pixmaps/nautilus/crux_eggplant -@dirrm share/gnome/pixmaps/nautilus @dirrm share/gnome/omf/nautilus -@dirrm share/gnome/nautilus/services/text -@dirrm share/gnome/nautilus/services -@dirrm share/gnome/nautilus/patterns @dirrm share/gnome/nautilus/linksets -@dirrm share/gnome/nautilus/emblems @dirrm share/gnome/nautilus/components/hyperbola/maps @dirrm share/gnome/nautilus/components/hyperbola @dirrm share/gnome/nautilus/components -@dirrm share/gnome/nautilus @dirrm share/gnome/help/nautilus-user-manual/ko/stylesheet-images @dirrm share/gnome/help/nautilus-user-manual/ko/figures @dirrm share/gnome/help/nautilus-user-manual/ko @@ -1164,8 +1140,3 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/help/gnugpl @dirrm share/gnome/help/gnufdl/C @dirrm share/gnome/help/gnufdl -@dirrm include/libnautilus -@dirrm etc/X11/sysconfig -@dirrm etc/X11/starthere -@dirrm etc/X11/serverconfig -@dirrm etc/X11 diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index 607b75d2472a..b8ea1e7c1397 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -19,18 +19,16 @@ LIB_DEPENDS= rsvg.1:${PORTSDIR}/graphics/librsvg USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomevfs USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${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' .include <bsd.port.mk> diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 0fc3cffb98c9..7c76afcf8b45 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -15,29 +15,26 @@ DIST_SUBDIR= gnome MAINTAINER?= gnome@FreeBSD.org LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \ - glade.4:${PORTSDIR}/devel/libglade \ iconv.3:${PORTSDIR}/converters/libiconv USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs +GNOME_HTML_DIR= ${PREFIX}/share/doc/gal USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static --with-libiconv \ - --with-html-dir=${PREFIX}/share/doc/gal +CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 0fc3cffb98c9..7c76afcf8b45 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -15,29 +15,26 @@ DIST_SUBDIR= gnome MAINTAINER?= gnome@FreeBSD.org LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \ - glade.4:${PORTSDIR}/devel/libglade \ iconv.3:${PORTSDIR}/converters/libiconv USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs +GNOME_HTML_DIR= ${PREFIX}/share/doc/gal USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static --with-libiconv \ - --with-html-dir=${PREFIX}/share/doc/gal +CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} -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|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile index 433ca5107333..0a21d91de2c8 100644 --- a/x11-toolkits/rep-gtk/Makefile +++ b/x11-toolkits/rep-gtk/Makefile @@ -21,7 +21,8 @@ PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} USE_X_PREFIX= yes USE_GMAKE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -36,8 +37,9 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) -USE_GNOME= yes +.if ${HAVE_GNOME:Mlibglade}!="" +USE_GNOME+= libglade +PKGNAMESUFFIX= -gnome CONFIGURE_ARGS= --with-gnome --with-libglade --with-gdk-pixbuf \ --with-gnome-canvas-pixbuf .else diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 8fe128b0adea..fa8edb140f40 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -28,11 +28,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_IMLIB= yes USE_REINPLACE= yes +USE_GNOMENG= yes WANT_GNOME= yes +USE_GNOME= gnomehack gnomehier gtk12 imlib esound GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-readline \ - --localstatedir=${PREFIX}/share \ - --datadir=${PREFIX}/share +CONFIGURE_ARGS= --with-readline CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} @@ -45,8 +45,9 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) -USE_GNOME= yes +.if ${HAVE_GNOME:Mlibcapplet}!="" && ${HAVE_GNOME:Mgdkpixbuf}!="" +USE_GNOME+= libcapplet gdkpixbuf +PKGNAMESUFFIX= -gnome CONFIGURE_ARGS+=--enable-capplet .else CONFIGURE_ARGS+=--disable-capplet \ @@ -54,15 +55,11 @@ CONFIGURE_ARGS+=--disable-capplet \ --without-gdk-pixbuf .endif -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|[(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' post-install: install-info --section="X11 window manager" \ diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist index a53d527dce5b..5ee9cf91ce91 100644 --- a/x11-wm/sawfish/pkg-plist +++ b/x11-wm/sawfish/pkg-plist @@ -69,7 +69,7 @@ share/gnome/pixmaps/sawfish-logo.png %%GNOME:%%share/gnome/pixmaps/sawfish-shortcuts.png %%GNOME:%%share/gnome/pixmaps/sawfish-tooltips.png %%GNOME:%%share/gnome/pixmaps/sawfish-workspaces.png -%%GNOME:%%share/gnome/wm-properties/Sawfish.desktop +share/gnome/wm-properties/Sawfish.desktop share/locale/az/LC_MESSAGES/sawfish.mo share/locale/bg/LC_MESSAGES/sawfish.mo share/locale/ca/LC_MESSAGES/sawfish.mo @@ -657,8 +657,6 @@ share/sawfish/%%VERSION%%/themes/smaker/close_inv.png share/sawfish/%%VERSION%%/themes/smaker/min.png share/sawfish/%%VERSION%%/themes/smaker/min_inv.png share/sawfish/%%VERSION%%/themes/smaker/theme.jl -@dirrm share/sawfish/themes -@dirrm share/sawfish/sounds @dirrm share/sawfish/%%VERSION%%/themes/smaker @dirrm share/sawfish/%%VERSION%%/themes/simple @dirrm share/sawfish/%%VERSION%%/themes/mono @@ -688,15 +686,11 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl @dirrm share/sawfish/%%VERSION%%/lisp/sawfish @dirrm share/sawfish/%%VERSION%%/lisp @dirrm share/sawfish/%%VERSION%% -@dirrm share/sawfish -%%NOGNOME:%%@dirrm share/gnome/pixmaps %%GNOME:%%@dirrm share/gnome/control-center/Sawfish %%GNOME:%%@dirrm share/gnome/apps/Settings/Sawfish -%%NOGNOME:%%@dirrm share/gnome @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%% @dirrm libexec/sawfish/%%VERSION%% -@dirrm libexec/sawfish @dirrm libexec/rep/%%GNUHOST%%/sawfish diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 1aaf9dcc8d2d..1ec3cb30830a 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -16,8 +16,6 @@ DIST_SUBDIR= gnome 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_X_PREFIX= yes 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 @@ MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \ 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 diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi index 1debdb2d3658..dd39ef04d88e 100644 --- a/x11/gnome-libs/files/patch-bi +++ b/x11/gnome-libs/files/patch-bi @@ -1,8 +1,8 @@ $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 @@ $FreeBSD$ 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) diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index fc35a1e0891d..28f7952f4aa6 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -538,14 +538,9 @@ share/locale/vi/LC_MESSAGES/gnome-libs.mo 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 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo @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 diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index f34ea21be9bb..8ce415d64a70 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -15,18 +15,15 @@ DIST_SUBDIR= gnome MAINTAINER?= gnome@FreeBSD.org -LIB_DEPENDS= gtkhtml.21:${PORTSDIR}/www/gtkhtml -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio - USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMECTRL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack gnomeprefix gnomehier libcapplet libglade gnomeaudio \ + libpanel INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ - --with-gtkhtml=${X11BASE} \ - --disable-gtk-doc +CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" @@ -40,11 +37,8 @@ MAN1= deskguide_applet.1 gmenu.1 gnome-about.1 gnome-convert.1 \ session-properties-capplet.1 MAN5= default.session.5 -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> diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah index b64f4f45357f..9c12f14097df 100644 --- a/x11/gnomecore/files/patch-ah +++ b/x11/gnomecore/files/patch-ah @@ -1,70 +1,51 @@ ---- panel/Makefile.in.orig Tue May 23 04:25:47 2000 -+++ panel/Makefile.in Fri May 26 15:30:48 2000 -@@ -169,7 +169,7 @@ - libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h + +$FreeBSD$ + +--- panel/Makefile.in.orig Sun Jul 7 11:41:07 2002 ++++ panel/Makefile.in Wed Jul 10 18:02:24 2002 +@@ -217,7 +217,7 @@ + libpanel_appletincludedir = $(includedir) + libpanel_statusincludedir = $(includedir) + +-lib_LTLIBRARIES = libpanel_applet.la libpanel_status.la ++lib_LTLIBRARIES = libpanel_status.la + + CORBA_SRCLIST = \ + gnome-panel-stubs.c \ +@@ -239,7 +239,7 @@ + gnome-panel.h -libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) +libpanel_applet_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir) libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) - libpanel_status_la_SOURCES = status-docklet.c $(CORBA_SRCLIST) -@@ -178,7 +178,7 @@ - libpanel_statusinclude_HEADERS = status-docklet.h + libpanel_status_la_SOURCES = \ +@@ -251,7 +251,7 @@ + status-docklet.h -libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) +libpanel_status_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir) libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) - BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -210,7 +210,7 @@ - EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in dockletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING panel.hints gnome-panel-properties.desktop nothing.cP title-item.gob + bad_applet_SOURCES = bad-applet.c +@@ -435,8 +435,8 @@ + $(man_MANS) -confexecdir = $(libdir) +-confexec_DATA = appletsConf.sh dockletsConf.sh +confexecdir = $(sysconfdir) - confexec_DATA = appletsConf.sh dockletsConf.sh ++confexec_DATA = dockletsConf.sh panelgnorbadir = $(sysconfdir)/CORBA/servers ---- panel/foobar-widget.c.orig Wed Sep 20 00:03:43 2000 -+++ panel/foobar-widget.c Mon Sep 25 14:26:18 2000 -@@ -602,7 +602,7 @@ - FALSE, "apps"); - foo->settings = - append_folder_menu(menu_bar, _("Settings"), NULL, TRUE, -- "gnome/apps/Settings"); -+ "apps/Settings"); - append_desktop_menu (menu_bar); - - gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0); ---- panel/menu.c.orig Fri Apr 27 15:46:00 2001 -+++ panel/menu.c Fri May 4 15:11:16 2001 -@@ -147,3 +147,3 @@ - and a level down*/ -- menu = gnome_datadir_file ("gnome/apps"); -+ menu = gnome_datadir_file ("apps"); - if (menu != NULL) -@@ -3436,3 +3436,3 @@ - { -- char *menudir = gnome_datadir_file ("gnome/apps"); -+ char *menudir = gnome_datadir_file ("apps"); - -@@ -4543,4 +4543,4 @@ - GTK_SIGNAL_FUNC(add_menu_to_panel), -- "gnome/apps"); -- setup_internal_applet_drag(submenuitem, "MENU:gnome/apps"); -+ "apps"); -+ setup_internal_applet_drag(submenuitem, "MENU:apps"); - ---- panel/menu-properties.c.orig Sat Sep 9 19:52:26 2000 -+++ panel/menu-properties.c Mon Sep 25 14:28:44 2000 -@@ -40,7 +40,7 @@ - arguments = "."; + panelgnorba_DATA = panel.gnorba +@@ -1278,7 +1278,6 @@ + install-data-am: install-man install-deskDATA install-gladeDATA \ + install-hintsDATA install-panelgnorbaDATA \ + install-soundlistDATA install-sysDATA \ +- install-libpanel_appletincludeHEADERS \ + install-libpanel_statusincludeHEADERS + install-data: install-data-recursive - if(strcmp(arguments, ".") == 0) -- this_menu = gnome_unconditional_datadir_file ("gnome/apps"); -+ this_menu = gnome_unconditional_datadir_file ("apps"); - else if (*arguments == '/') - this_menu = g_strdup (arguments); - else if (*arguments == '~') diff --git a/x11/gnomecore/files/patch-idl::Makefile.in b/x11/gnomecore/files/patch-idl::Makefile.in new file mode 100644 index 000000000000..712f85a01e9e --- /dev/null +++ b/x11/gnomecore/files/patch-idl::Makefile.in @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- idl/Makefile.in 2002/07/10 14:57:23 1.1 ++++ idl/Makefile.in 2002/07/10 14:58:38 +@@ -180,7 +180,6 @@ + idldir = $(datadir)/idl + + idl_DATA = \ +- gnome-panel.idl \ + help-browser.idl \ + Terminal.idl + diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist index dc0dff962afc..fcf3022d02e8 100644 --- a/x11/gnomecore/pkg-plist +++ b/x11/gnomecore/pkg-plist @@ -31,15 +31,12 @@ etc/CORBA/servers/gnome-terminal.gnorba etc/CORBA/servers/help-browser.gnorba etc/CORBA/servers/panel.gnorba etc/CORBA/servers/tasklist_applet.gnorba -etc/appletsConf.sh etc/dockletsConf.sh etc/gnome/panel-config/panel etc/gnome/panel-config/panel.d/default/Applet_Config etc/gnome/panel-config/panel.d/default/panel etc/sound/events/mailcheck.soundlist etc/sound/events/panel.soundlist -include/applet-widget.h -include/gnome-panel.h include/status-docklet.h lib/libfish_applet.a lib/libfish_applet.so @@ -47,9 +44,6 @@ lib/libfish_applet.so.5 lib/libgen_util_applet.a lib/libgen_util_applet.so lib/libgen_util_applet.so.5 -lib/libpanel_applet.a -lib/libpanel_applet.so -lib/libpanel_applet.so.5 lib/libpanel_status.a lib/libpanel_status.so lib/libpanel_status.so.5 @@ -866,7 +860,6 @@ share/gnome/help/tasklist_applet/eu/tasklist_applet.sgml share/gnome/help/tasklist_applet/eu/topic.dat share/gnome/hints/panel.hints share/gnome/idl/Terminal.idl -share/gnome/idl/gnome-panel.idl share/gnome/idl/help-browser.idl share/gnome/mc/templates/Emacs.desktop share/gnome/mc/templates/Eterm.desktop @@ -1136,13 +1129,7 @@ share/locale/wa/LC_MESSAGES/gnome-core.mo share/locale/zh_CN/LC_MESSAGES/gnome-core.mo share/locale/zh_TW/LC_MESSAGES/gnome-core.mo @dirrm share/gnome/pixmaps/tiles -@dirrm share/gnome/pixmaps/splash -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/fish -@dirrm share/gnome/panel @dirrm share/gnome/omf/gnome-core -@dirrm share/gnome/mc/templates -@dirrm share/gnome/mc @dirrm share/gnome/hints @dirrm share/gnome/help/tasklist_applet/eu/stylesheet-images @dirrm share/gnome/help/tasklist_applet/eu/figures @@ -1223,8 +1210,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo @dirrm share/gnome/help/mailcheck_applet @dirrm share/gnome/help/lgpl/C/stylesheet-images @dirrm share/gnome/help/lgpl/C/figures -@dirrm share/gnome/help/lgpl/C -@dirrm share/gnome/help/lgpl @dirrm share/gnome/help/help-browser/wa @dirrm share/gnome/help/help-browser/uk @dirrm share/gnome/help/help-browser/no @@ -1245,8 +1230,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo @dirrm share/gnome/help/help-browser @dirrm share/gnome/help/gpl/C/stylesheet-images @dirrm share/gnome/help/gpl/C/figures -@dirrm share/gnome/help/gpl/C -@dirrm share/gnome/help/gpl @dirrm share/gnome/help/gnome-terminal/no/stylesheet-images @dirrm share/gnome/help/gnome-terminal/no/figures @dirrm share/gnome/help/gnome-terminal/no @@ -1267,8 +1250,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo @dirrm share/gnome/help/gnome-terminal/da @dirrm share/gnome/help/gnome-terminal/C/stylesheet-images @dirrm share/gnome/help/gnome-terminal/C/figures -@dirrm share/gnome/help/gnome-terminal/C -@dirrm share/gnome/help/gnome-terminal @dirrm share/gnome/help/gnome-feedback/no/stylesheet-images @dirrm share/gnome/help/gnome-feedback/no/figures @dirrm share/gnome/help/gnome-feedback/no @@ -1298,8 +1279,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo @dirrm share/gnome/help/fish_applet @dirrm share/gnome/help/fdl/C/stylesheet-images @dirrm share/gnome/help/fdl/C/figures -@dirrm share/gnome/help/fdl/C -@dirrm share/gnome/help/fdl @dirrm share/gnome/help/desk-guide_applet/it/stylesheet-images @dirrm share/gnome/help/desk-guide_applet/it/figures @dirrm share/gnome/help/desk-guide_applet/it @@ -1332,23 +1311,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo @dirrm share/gnome/help/clock_applet/C/figures @dirrm share/gnome/help/clock_applet/C @dirrm share/gnome/help/clock_applet -@dirrm share/gnome/gnome-terminal/glade -@dirrm share/gnome/gnome-terminal -@dirrm share/gnome/gnome-about -@dirrm share/gnome/apps/Utilities -@dirrm share/gnome/apps/System -@dirrm share/gnome/apps/Multimedia -@dirrm share/gnome/apps/Internet -@dirrm share/gnome/apps/Graphics -@dirrm share/gnome/apps/Games -@dirrm share/gnome/apps/Development -@dirrm share/gnome/applets/Utility -@dirrm share/gnome/applets/Network -@dirrm share/gnome/applets/Multimedia -@dirrm share/gnome/applets/Monitors -@dirrm share/gnome/applets/Clocks -@dirrm share/gnome/applets/Amusements -@dirrm share/gnome/applets @dirrm share/doc/panel/panel @dirrm share/doc/panel @dirrm etc/gnome/panel-config/panel.d/default diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 1aaf9dcc8d2d..1ec3cb30830a 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -16,8 +16,6 @@ DIST_SUBDIR= gnome 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_X_PREFIX= yes 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 @@ MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \ 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 diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi index 1debdb2d3658..dd39ef04d88e 100644 --- a/x11/gnomelibs/files/patch-bi +++ b/x11/gnomelibs/files/patch-bi @@ -1,8 +1,8 @@ $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 @@ $FreeBSD$ 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) diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index fc35a1e0891d..28f7952f4aa6 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -538,14 +538,9 @@ share/locale/vi/LC_MESSAGES/gnome-libs.mo 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 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo @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 |