aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astro/seti_applet/Makefile27
-rw-r--r--audio/gnapster/Makefile10
-rw-r--r--audio/gnome-audio/Makefile6
-rw-r--r--audio/gnome-audio/files/patch-aa2
-rw-r--r--audio/gnome-media/Makefile9
-rw-r--r--audio/gnomeaudio/Makefile6
-rw-r--r--audio/gnomeaudio/files/patch-aa2
-rw-r--r--audio/gnomeaudio2/Makefile6
-rw-r--r--audio/gnomeaudio2/files/patch-aa2
-rw-r--r--audio/gnomemedia/Makefile9
-rw-r--r--audio/gnomemedia2/Makefile9
-rw-r--r--audio/yamt/Makefile19
-rw-r--r--audio/yamt/files/patch-aa16
-rw-r--r--audio/yamt/files/patch-ab11
-rw-r--r--databases/mysql-navigator/Makefile4
-rw-r--r--databases/mysql-navigator/files/patch-aa4
-rw-r--r--deskutils/bitnotes/Makefile11
-rw-r--r--deskutils/bulb/Makefile17
-rw-r--r--deskutils/genius/Makefile11
-rw-r--r--deskutils/gnofin/Makefile21
-rw-r--r--deskutils/gnofin/pkg-plist25
-rw-r--r--deskutils/gnome-pim/Makefile10
-rw-r--r--deskutils/gnomepim/Makefile10
-rw-r--r--deskutils/gnucash/Makefile24
-rw-r--r--deskutils/gnucash/pkg-plist464
-rw-r--r--deskutils/yank/Makefile17
-rw-r--r--deskutils/yank/pkg-plist6
-rw-r--r--devel/bonobo/Makefile13
-rw-r--r--devel/bug-buddy/Makefile6
-rw-r--r--devel/bugbuddy/Makefile6
-rw-r--r--devel/bugbuddy2/Makefile6
-rw-r--r--devel/gconf/Makefile13
-rw-r--r--devel/gconf2/Makefile13
-rw-r--r--devel/gide/Makefile15
-rw-r--r--devel/gide/files/patch-bb22
-rw-r--r--devel/glade/Makefile17
-rw-r--r--devel/glade/pkg-plist1
-rw-r--r--devel/glade2/Makefile17
-rw-r--r--devel/glade2/pkg-plist1
-rw-r--r--devel/gnome-vfs/Makefile14
-rw-r--r--devel/gnome-vfs1/Makefile14
-rw-r--r--devel/gnomevfs/Makefile14
-rw-r--r--devel/gnomevfs2/Makefile14
-rw-r--r--devel/gtranslator/Makefile16
-rw-r--r--devel/libglade/Makefile7
-rw-r--r--devel/libglade/files/patch-ab3
-rw-r--r--devel/libglade2/Makefile7
-rw-r--r--devel/libglade2/files/patch-ab3
-rw-r--r--devel/libgtop/Makefile7
-rw-r--r--devel/libgtop2/Makefile7
-rw-r--r--devel/pharmacy/Makefile20
-rw-r--r--devel/pharmacy/pkg-plist2
-rw-r--r--editors/dedit/Makefile13
-rw-r--r--editors/gedit/Makefile11
-rw-r--r--editors/gedit2/Makefile11
-rw-r--r--editors/ghex/Makefile11
-rw-r--r--editors/ghex2/Makefile11
-rw-r--r--editors/glimmer/Makefile18
-rw-r--r--editors/gmanedit/Makefile14
-rw-r--r--finance/gnofin/Makefile21
-rw-r--r--finance/gnofin/pkg-plist25
-rw-r--r--finance/gnucash-devel/Makefile24
-rw-r--r--finance/gnucash-devel/pkg-plist464
-rw-r--r--finance/gnucash/Makefile24
-rw-r--r--finance/gnucash/pkg-plist464
-rw-r--r--ftp/gtm/Makefile15
-rw-r--r--ftp/junglemonkey/Makefile11
-rw-r--r--games/atomix/Makefile9
-rw-r--r--games/bombermaze/Makefile17
-rw-r--r--games/gcompris/Makefile24
-rw-r--r--games/gcompris/pkg-plist26
-rw-r--r--games/gcompris2/Makefile24
-rw-r--r--games/gcompris2/pkg-plist26
-rw-r--r--games/gno3dtet/Makefile21
-rw-r--r--games/gno3dtet/pkg-plist32
-rw-r--r--games/gnocatan/Makefile10
-rw-r--r--games/gnome-games/Makefile10
-rw-r--r--games/gnomechess/Makefile14
-rw-r--r--games/gnomegames/Makefile10
-rw-r--r--games/gnomegames2/Makefile10
-rw-r--r--games/gnomememoryblocks/Makefile13
-rw-r--r--games/gtetrinet/Makefile10
-rw-r--r--games/gtetrinet/pkg-plist12
-rw-r--r--games/gtktetcolor/Makefile16
-rw-r--r--games/pioneers/Makefile10
-rw-r--r--games/pythoong/Makefile19
-rw-r--r--graphics/diacanvas/Makefile12
-rw-r--r--graphics/diacanvas/files/patch-ac11
-rw-r--r--graphics/diacanvas/pkg-plist3
-rw-r--r--graphics/electriceyes/Makefile10
-rw-r--r--graphics/eog/Makefile6
-rw-r--r--graphics/eog2/Makefile6
-rw-r--r--graphics/gdk-pixbuf/Makefile13
-rw-r--r--graphics/gdk-pixbuf/files/patch-ac12
-rw-r--r--graphics/gnofract4d/Makefile16
-rw-r--r--graphics/gnofract4d/pkg-plist1
-rw-r--r--graphics/morpheus/Makefile17
-rw-r--r--graphics/sodipodi/Makefile10
-rw-r--r--graphics/xmps/Makefile28
-rw-r--r--graphics/xmps/files/patch-aa27
-rw-r--r--graphics/xmps/pkg-plist40
-rw-r--r--multimedia/xmps/Makefile28
-rw-r--r--multimedia/xmps/files/patch-aa27
-rw-r--r--multimedia/xmps/pkg-plist40
104 files changed, 1208 insertions, 1565 deletions
diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile
index de0735e999eb..34b99df1c530 100644
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@@ -13,24 +13,23 @@ MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
MAINTAINER= th@cis.ibaraki.ac.jp
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- gnome.4:${PORTSDIR}/x11/gnomelibs \
- gtop.1:${PORTSDIR}/devel/libgtop
-RUN_DEPENDS= setiathome:${PORTSDIR}/astro/setiathome \
- gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
+RUN_DEPENDS= setiathome:${PORTSDIR}/astro/setiathome
USE_X_PREFIX= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+ @${PERL} -pi -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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
post-install:
- ${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${PKGMESSAGE}
+ @${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 4f0a035ffcc5..dcbc2d6b282d 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -12,19 +12,15 @@ MASTER_SITES= http://www.faradic.net/~jasta/files/
MAINTAINER= cpiazza@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- ungif.5:${PORTSDIR}/graphics/libungif
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_XPM= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- GTK_CONFIG="${GTK_CONFIG}"
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 0232dfb10729..7997f994fdad 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -14,15 +14,11 @@ DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
-BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
NO_BUILD= yes
-INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install
-
post-extract:
@${RM} -fr ${WRKSRC}/sounds/sounds
diff --git a/audio/gnome-audio/files/patch-aa b/audio/gnome-audio/files/patch-aa
index 905fd58df364..13a86220f234 100644
--- a/audio/gnome-audio/files/patch-aa
+++ b/audio/gnome-audio/files/patch-aa
@@ -12,7 +12,7 @@
- install -d $(prefix)/share/sounds/`dirname $$I`; \
- install -m444 $$I $(prefix)/share/sounds/$$I; \
+ mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+ ${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
++ ${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
done
install-default-links:
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index d669cae2653b..92f098633e89 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -14,16 +14,13 @@ DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
-BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --without-ncurses \
- --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS= --without-ncurses
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index 0232dfb10729..7997f994fdad 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -14,15 +14,11 @@ DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
-BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
NO_BUILD= yes
-INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install
-
post-extract:
@${RM} -fr ${WRKSRC}/sounds/sounds
diff --git a/audio/gnomeaudio/files/patch-aa b/audio/gnomeaudio/files/patch-aa
index 905fd58df364..13a86220f234 100644
--- a/audio/gnomeaudio/files/patch-aa
+++ b/audio/gnomeaudio/files/patch-aa
@@ -12,7 +12,7 @@
- install -d $(prefix)/share/sounds/`dirname $$I`; \
- install -m444 $$I $(prefix)/share/sounds/$$I; \
+ mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+ ${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
++ ${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
done
install-default-links:
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index 0232dfb10729..7997f994fdad 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -14,15 +14,11 @@ DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
-BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
NO_BUILD= yes
-INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install
-
post-extract:
@${RM} -fr ${WRKSRC}/sounds/sounds
diff --git a/audio/gnomeaudio2/files/patch-aa b/audio/gnomeaudio2/files/patch-aa
index 905fd58df364..13a86220f234 100644
--- a/audio/gnomeaudio2/files/patch-aa
+++ b/audio/gnomeaudio2/files/patch-aa
@@ -12,7 +12,7 @@
- install -d $(prefix)/share/sounds/`dirname $$I`; \
- install -m444 $$I $(prefix)/share/sounds/$$I; \
+ mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+ ${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
++ ${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
done
install-default-links:
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index d669cae2653b..92f098633e89 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -14,16 +14,13 @@ DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
-BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --without-ncurses \
- --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS= --without-ncurses
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index d669cae2653b..92f098633e89 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -14,16 +14,13 @@ DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
-BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --without-ncurses \
- --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS= --without-ncurses
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index fc622c171a01..3b5b9c2f0472 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -14,15 +14,20 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dima@Chg.RU
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gnome=${X11BASE}
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -e \
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+ s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/audio/yamt/files/patch-aa b/audio/yamt/files/patch-aa
index 8ec874f181c6..702068db770a 100644
--- a/audio/yamt/files/patch-aa
+++ b/audio/yamt/files/patch-aa
@@ -1,11 +1,11 @@
---- pixmaps/Makefile.in.orig Tue Feb 15 20:09:05 2000
-+++ pixmaps/Makefile.in Thu Feb 17 11:57:57 2000
-@@ -113,7 +113,7 @@
- EXTRA_DIST = yamt-logo.png
+--- configure.orig Sat Jun 3 20:35:31 2000
++++ configure Sat Jun 3 20:36:07 2000
+@@ -4366,7 +4366,7 @@
+
+ fi
+
+-PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/${PACKAGE}"
++PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps"
--pixmapdir = $(datadir)/pixmaps/yamt
-+pixmapdir = $(datadir)/gnome/pixmaps
- pixmap_DATA = $(EXTRA_DIST)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/yamt/files/patch-ab b/audio/yamt/files/patch-ab
new file mode 100644
index 000000000000..b1fba12ec832
--- /dev/null
+++ b/audio/yamt/files/patch-ab
@@ -0,0 +1,11 @@
+--- pixmaps/Makefile.in.orig Sat Jun 3 20:47:40 2000
++++ pixmaps/Makefile.in Sat Jun 3 20:47:54 2000
+@@ -113,7 +113,7 @@
+ EXTRA_DIST = yamt-logo.png yamt-icon.png
+
+
+-pixmapdir = $(datadir)/pixmaps/yamt
++pixmapdir = $(datadir)/pixmaps
+
+ pixmap_DATA = $(EXTRA_DIST)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 0b48054b0a16..55477951800a 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -13,10 +13,10 @@ DISTNAME= mysql_navigator_ver_${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS= mysqlclient.6:${PORTSDIR}/databases/mysql322-client
USE_X_PREFIX= yes
+USE_GNOME= yes
ALL_TARGET=
diff --git a/databases/mysql-navigator/files/patch-aa b/databases/mysql-navigator/files/patch-aa
index 6a3405348829..2781f9d6d967 100644
--- a/databases/mysql-navigator/files/patch-aa
+++ b/databases/mysql-navigator/files/patch-aa
@@ -4,9 +4,9 @@
-CFLAGS = -I/usr/local/mysql/include/mysql/ `gtk-config --cflags` `gnome-config --cflags gnome gnomeui`
-LIBS = -L/usr/local/mysql/lib/mysql/ -lmysqlclient `gtk-config --libs` `gnome-config --libs gnome gnomeui`
-CC = gcc
-+CFLAGS = -I$(LOCALBASE)/include/mysql `$(X11BASE)/bin/gtk12-config --cflags` \
++CFLAGS = -I$(LOCALBASE)/include/mysql `$(GTK_CONFIG) --cflags` \
+ `$(X11BASE)/bin/gnome-config --cflags gnome gnomeui`
-+LIBS = -L$(LOCALBASE)/lib/mysql -lmysqlclient `$(X11BASE)/bin/gtk12-config --libs` \
++LIBS = -L$(LOCALBASE)/lib/mysql -lmysqlclient `$(GTK_CONFIG) --libs` \
+ `$(X11BASE)/bin/gnome-config --libs gnome gnomeui`
+#CC = gcc
OUTFILE = mn
diff --git a/deskutils/bitnotes/Makefile b/deskutils/bitnotes/Makefile
index 04d0c3b29cb5..0fc66587aab9 100644
--- a/deskutils/bitnotes/Makefile
+++ b/deskutils/bitnotes/Makefile
@@ -15,22 +15,15 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- gnome.4:${PORTSDIR}/x11/gnomelibs
WRKSRC= ${WRKDIR}/BitNotes
USE_X_PREFIX= yes
USE_AUTOCONF= yes
USE_GMAKE= yes
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+USE_GNOME= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GTK_CONFIG="${GTK_CONFIG}"
+ LIBS="-L${LOCALBASE}/lib"
AUTOCONF= autoconf && \
${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/deskutils/bulb/Makefile b/deskutils/bulb/Makefile
index b19b416fb595..cab2b75907c9 100644
--- a/deskutils/bulb/Makefile
+++ b/deskutils/bulb/Makefile
@@ -12,13 +12,16 @@ MASTER_SITES= http://www.idiap.ch/~gobry/bulb/
MAINTAINER= smoberly@xavier.dyndns.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
+USE_X_PREFIX= yes
+USE_GNOME= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-USE_X_PREFIX= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" LDFLAGS="-L${LOCALBASE}/lib -lintl"
-CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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
.include <bsd.port.mk>
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 3c762d3d936d..6dc3859ec9bd 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -12,20 +12,11 @@ MASTER_SITES= http://ftp.5z.com/pub/genius/
MAINTAINER= ade@FreeBSD.org
-BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile
index ee50298608c7..c7d26ec5c177 100644
--- a/deskutils/gnofin/Makefile
+++ b/deskutils/gnofin/Makefile
@@ -13,17 +13,24 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
USE_GMAKE= yes
+USE_GNOME= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
MAN1= gnofin.1
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -e \
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+ s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+ @find ${WRKSRC}/plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
.include <bsd.port.mk>
diff --git a/deskutils/gnofin/pkg-plist b/deskutils/gnofin/pkg-plist
index 02138384f313..acabc7d57fd0 100644
--- a/deskutils/gnofin/pkg-plist
+++ b/deskutils/gnofin/pkg-plist
@@ -1,28 +1,13 @@
bin/gnofin
-lib/gnofin/plugins/libqif.so.0
-lib/gnofin/plugins/libqif.so
-lib/gnofin/plugins/libqif.a
-lib/gnofin/plugins/libhtml.so.0
-lib/gnofin/plugins/libhtml.so
-lib/gnofin/plugins/libhtml.a
-lib/gnofin/plugins/liblatex.so.0
-lib/gnofin/plugins/liblatex.so
-lib/gnofin/plugins/liblatex.a
-lib/gnofin/plugins/libtext.so.0
-lib/gnofin/plugins/libtext.so
-lib/gnofin/plugins/libtext.a
-lib/gnofin/plugins/libcbb.so.0
lib/gnofin/plugins/libcbb.so
-lib/gnofin/plugins/libcbb.a
-lib/gnofin/plugins/libfind.so.0
lib/gnofin/plugins/libfind.so
-lib/gnofin/plugins/libfind.a
-lib/gnofin/plugins/libreconcile.so.0
+lib/gnofin/plugins/libhtml.so
+lib/gnofin/plugins/liblatex.so
+lib/gnofin/plugins/libqif.so
lib/gnofin/plugins/libreconcile.so
-lib/gnofin/plugins/libreconcile.a
-lib/gnofin/plugins/libsched.so.0
lib/gnofin/plugins/libsched.so
-lib/gnofin/plugins/libsched.a
+lib/gnofin/plugins/libtext.so
share/gnome/apps/Applications/gnofin.desktop
+share/locale/fr/LC_MESSAGES/gnofin.mo
@dirrm lib/gnofin/plugins
@dirrm lib/gnofin
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 49b1d63975c2..b3bb8583a15d 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -14,28 +14,22 @@ DISTNAME= gnome-pim-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
-
.if defined(WITH_GNOMEPILOT)
LIB_DEPENDS+= gpilotd.0:${PORTSDIR}/palm/gnomepilot
PILOTINC= "-I${LOCALBASE}/pilot/include"
PILOTLIB= "-L${LOCALBASE}/pilot/lib"
PLIST_SUB+= GNOMEPILOT:=""
.else
-PILOTARGS= --without-pisock --disable-pilotlinktest
+CONFIGURE_ARGS= --without-pisock --disable-pilotlinktest
EXTRA_PATCHES= ${FILESDIR}/patch.nopilot
PLIST_SUB+= GNOMEPILOT:="@comment "
.endif
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome ${PILOTARGS}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PILOTINC}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib ${PILOTLIB}"
.if !defined(WITH_GNOMEPILOT)
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 49b1d63975c2..b3bb8583a15d 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -14,28 +14,22 @@ DISTNAME= gnome-pim-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
-
.if defined(WITH_GNOMEPILOT)
LIB_DEPENDS+= gpilotd.0:${PORTSDIR}/palm/gnomepilot
PILOTINC= "-I${LOCALBASE}/pilot/include"
PILOTLIB= "-L${LOCALBASE}/pilot/lib"
PLIST_SUB+= GNOMEPILOT:=""
.else
-PILOTARGS= --without-pisock --disable-pilotlinktest
+CONFIGURE_ARGS= --without-pisock --disable-pilotlinktest
EXTRA_PATCHES= ${FILESDIR}/patch.nopilot
PLIST_SUB+= GNOMEPILOT:="@comment "
.endif
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome ${PILOTARGS}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PILOTINC}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib ${PILOTLIB}"
.if !defined(WITH_GNOMEPILOT)
diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile
index 9f69b20d6a7e..ef1f3fa38ea4 100644
--- a/deskutils/gnucash/Makefile
+++ b/deskutils/gnucash/Makefile
@@ -19,30 +19,34 @@ MAINTAINER= ade@FreeBSD.org
BUILD_DEPENDS= swig:${PORTSDIR}/devel/SWIG \
g-wrap:${PORTSDIR}/devel/g-wrap \
eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- guile.9:${PORTSDIR}/lang/guile
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
RUN_DEPENDS= slib48:${PORTSDIR}/lang/slib \
gnuplot:${PORTSDIR}/math/gnuplot \
${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww
site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+USE_X_PREFIX= yes
USE_GMAKE= yes
USE_XPM= yes
-USE_X_PREFIX= yes
USE_PERL5= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-CONFIGURE_ENV= MAKE=gmake \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}"
CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
MAN1= gnc-prices.1 gnucash.1
+pre-patch:
+ @${PERL} -pi -e 's^-l(pthread|c_r)^-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^\$\{datadir\}/aclocal^\$\(prefix\)/share/aclocal^g ; \
+ s^\$\{datadir\}/locale^\$\(prefix\)/share/locale^g'
post-install:
@strip ${PREFIX}/bin/gnucash
diff --git a/deskutils/gnucash/pkg-plist b/deskutils/gnucash/pkg-plist
index af03769fe596..bf9f7520019b 100644
--- a/deskutils/gnucash/pkg-plist
+++ b/deskutils/gnucash/pkg-plist
@@ -11,223 +11,223 @@ lib/gnucash/perl/libgncswig.so.1
@exec /sbin/ldconfig -m %D/lib/gnucash
@unexec /sbin/ldconfig -R
share/gnome/apps/Applications/gnucash.desktop
-share/gnucash/doc/AUTHORS
-share/gnucash/doc/COPYING
-share/gnucash/doc/ChangeLog
-share/gnucash/doc/INSTALL
-share/gnucash/doc/NEWS
-share/gnucash/doc/README
-share/gnucash/doc/README.francais
-share/gnucash/doc/README.german
-share/gnucash/doc/examples/Money95bank_fr.qif
-share/gnucash/doc/examples/Money95invst_fr.qif
-share/gnucash/doc/examples/Money95mfunds_fr.qif
-share/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnucash/doc/examples/README
-share/gnucash/doc/examples/abc-all.qif
-share/gnucash/doc/examples/abc.qif
-share/gnucash/doc/examples/bogus.qif
-share/gnucash/doc/examples/cbb-export.qif
-share/gnucash/doc/examples/currency.xac
-share/gnucash/doc/examples/every.qif
-share/gnucash/doc/examples/ms-money.qif
-share/gnucash/doc/examples/quicktest.qif
-share/gnucash/doc/examples/splitdemo.xac
-share/gnucash/doc/examples/swipe.qif
-share/gnucash/doc/examples/test.xac
-share/gnucash/doc/examples/test2.xac
-share/gnucash/doc/examples/test3.xac
-share/gnucash/doc/examples/test4.xac
-share/gnucash/doc/examples/trading.xac
-share/gnucash/doc/examples/trading2.xac
-share/gnucash/doc/examples/web.qif
-share/gnucash/doc/examples/xfer.xac
-share/gnucash/doc/gnc.html
-share/gnucash/doc/guile-hackers.txt
-share/gnucash/html/C/RAW-NOTES
-share/gnucash/html/C/bofa-mym.html
-share/gnucash/html/C/image/appr-asset1.gif
-share/gnucash/html/C/image/appr-asset2.gif
-share/gnucash/html/C/image/appr-income.gif
-share/gnucash/html/C/image/appr-main1.gif
-share/gnucash/html/C/image/appr-main2.gif
-share/gnucash/html/C/image/bal-graph.gif
-share/gnucash/html/C/image/contract.gif
-share/gnucash/html/C/image/depr-asset.gif
-share/gnucash/html/C/image/depr-main.gif
-share/gnucash/html/C/image/expand.gif
-share/gnucash/html/C/image/foliowin-single.gif
-share/gnucash/html/C/image/foliowin.gif
-share/gnucash/html/C/image/logo-NetBSD-banner.gif
-share/gnucash/html/C/image/logo-bullogogross.gif
-share/gnucash/html/C/image/logo-debian.jpg
-share/gnucash/html/C/image/logo-ibm.gif
-share/gnucash/html/C/image/logo-linux.gif
-share/gnucash/html/C/image/logo-sgi.gif
-share/gnucash/html/C/image/logo-skunkware.gif
-share/gnucash/html/C/image/newaccwin-code.gif
-share/gnucash/html/C/image/newaccwin-trade.gif
-share/gnucash/html/C/image/recnwin.gif
-share/gnucash/html/C/image/regwin-double.gif
-share/gnucash/html/C/image/regwin-multi.gif
-share/gnucash/html/C/image/regwin-single.gif
-share/gnucash/html/C/image/regwin-single2.gif
-share/gnucash/html/C/image/report-av-baln.gif
-share/gnucash/html/C/image/report-baln.gif
-share/gnucash/html/C/image/report-folio.gif
-share/gnucash/html/C/image/report-option.gif
-share/gnucash/html/C/image/report-pnl.gif
-share/gnucash/html/C/image/reportwin.gif
-share/gnucash/html/C/image/ticker-a.gif
-share/gnucash/html/C/image/ticker-b.gif
-share/gnucash/html/C/projects.html
-share/gnucash/html/C/xacc-about.html
-share/gnucash/html/C/xacc-accountedit.html
-share/gnucash/html/C/xacc-acctypes.html
-share/gnucash/html/C/xacc-accwin.html
-share/gnucash/html/C/xacc-adjbwin.html
-share/gnucash/html/C/xacc-apar.html
-share/gnucash/html/C/xacc-apprdepr.html
-share/gnucash/html/C/xacc-bal_tracker.html
-share/gnucash/html/C/xacc-balsheet.html
-share/gnucash/html/C/xacc-currency.html
-share/gnucash/html/C/xacc-date.html
-share/gnucash/html/C/xacc-double.html
-share/gnucash/html/C/xacc-euro.html
-share/gnucash/html/C/xacc-expense.html
-share/gnucash/html/C/xacc-find-transactions.html
-share/gnucash/html/C/xacc-globalprefs.html
-share/gnucash/html/C/xacc-globalprops.html
-share/gnucash/html/C/xacc-gpl.html
-share/gnucash/html/C/xacc-groups.html
-share/gnucash/html/C/xacc-main.html
-share/gnucash/html/C/xacc-mainwin.html
-share/gnucash/html/C/xacc-pnl.html
-share/gnucash/html/C/xacc-portfolio_report.html
-share/gnucash/html/C/xacc-print.html
-share/gnucash/html/C/xacc-qif-import.html
-share/gnucash/html/C/xacc-quicken.html
-share/gnucash/html/C/xacc-recnwin.html
-share/gnucash/html/C/xacc-regwin.html
-share/gnucash/html/C/xacc-regwin_kbd.html
-share/gnucash/html/C/xacc-reports.html
-share/gnucash/html/C/xacc-ticker.html
-share/gnucash/html/C/xacc-trans_report.html
-share/gnucash/html/C/xacc-y2k.html
-share/gnucash/html/fr/bofa-mym.html
-share/gnucash/html/fr/image/appr-asset1.gif
-share/gnucash/html/fr/image/appr-asset2.gif
-share/gnucash/html/fr/image/appr-income.gif
-share/gnucash/html/fr/image/appr-main1.gif
-share/gnucash/html/fr/image/appr-main2.gif
-share/gnucash/html/fr/image/contract.gif
-share/gnucash/html/fr/image/depr-asset.gif
-share/gnucash/html/fr/image/depr-main.gif
-share/gnucash/html/fr/image/expand.gif
-share/gnucash/html/fr/image/foliowin-single.gif
-share/gnucash/html/fr/image/foliowin.gif
-share/gnucash/html/fr/image/newaccwin-code.gif
-share/gnucash/html/fr/image/newaccwin-trade.gif
-share/gnucash/html/fr/image/newaccwin.gif
-share/gnucash/html/fr/image/recnwin.gif
-share/gnucash/html/fr/image/regwin-double.gif
-share/gnucash/html/fr/image/regwin-multi.gif
-share/gnucash/html/fr/image/regwin-single.gif
-share/gnucash/html/fr/image/regwin-single2.gif
-share/gnucash/html/fr/image/regwin.gif
-share/gnucash/html/fr/image/report-baln.gif
-share/gnucash/html/fr/image/report-folio.gif
-share/gnucash/html/fr/image/report-option.gif
-share/gnucash/html/fr/image/reportwin.gif
-share/gnucash/html/fr/image/ticker-a.gif
-share/gnucash/html/fr/image/ticker-b.gif
-share/gnucash/html/fr/projects.html
-share/gnucash/html/fr/xacc-about.html
-share/gnucash/html/fr/xacc-accountedit.html
-share/gnucash/html/fr/xacc-acctypes.html
-share/gnucash/html/fr/xacc-accwin.html
-share/gnucash/html/fr/xacc-adjbwin.html
-share/gnucash/html/fr/xacc-apar.html
-share/gnucash/html/fr/xacc-apprdepr.html
-share/gnucash/html/fr/xacc-bal_tracker.html
-share/gnucash/html/fr/xacc-balsheet.html
-share/gnucash/html/fr/xacc-currency.html
-share/gnucash/html/fr/xacc-date.html
-share/gnucash/html/fr/xacc-double.html
-share/gnucash/html/fr/xacc-expense.html
-share/gnucash/html/fr/xacc-globalprefs.html
-share/gnucash/html/fr/xacc-gpl-fr.html
-share/gnucash/html/fr/xacc-gpl.html
-share/gnucash/html/fr/xacc-groups.html
-share/gnucash/html/fr/xacc-main.html
-share/gnucash/html/fr/xacc-mainwin.html
-share/gnucash/html/fr/xacc-pnl.html
-share/gnucash/html/fr/xacc-print.html
-share/gnucash/html/fr/xacc-quicken.html
-share/gnucash/html/fr/xacc-recnwin.html
-share/gnucash/html/fr/xacc-regwin.html
-share/gnucash/html/fr/xacc-reports.html
-share/gnucash/html/fr/xacc-ticker.html
-share/gnucash/html/fr/xacc-trans_report.html
-share/gnucash/html/fr/xacc-y2k.html
-share/gnucash/html/gnucash.css
-share/gnucash/html/index.html
-share/gnucash/perl/Quote.pm
-share/gnucash/perl/gnucash.pm
-share/gnucash/scm/bootstrap.scm
-share/gnucash/scm/bs-interp.scm
-share/gnucash/scm/c-interface.scm
-share/gnucash/scm/command-line.scm
-share/gnucash/scm/config-var.scm
-share/gnucash/scm/currencies.scm
-share/gnucash/scm/date-utilities.scm
-share/gnucash/scm/depend.scm
-share/gnucash/scm/doc.scm
-share/gnucash/scm/engine-interface.scm
-share/gnucash/scm/engine-utilities.scm
-share/gnucash/scm/extensions.scm
-share/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnucash/scm/gnumeric/table-utils.scm
-share/gnucash/scm/graph.scm
-share/gnucash/scm/hooks.scm
-share/gnucash/scm/html-generator.scm
-share/gnucash/scm/main.scm
-share/gnucash/scm/options.scm
-share/gnucash/scm/path.scm
-share/gnucash/scm/prefs.scm
-share/gnucash/scm/printing/number-to-words.scm
-share/gnucash/scm/printing/print-check.scm
-share/gnucash/scm/qif-import/qif-dialog-utils.scm
-share/gnucash/scm/qif-import/qif-file.scm
-share/gnucash/scm/qif-import/qif-guess-map.scm
-share/gnucash/scm/qif-import/qif-import.scm
-share/gnucash/scm/qif-import/qif-objects.scm
-share/gnucash/scm/qif-import/qif-parse.scm
-share/gnucash/scm/qif-import/qif-to-gnc.scm
-share/gnucash/scm/qif-import/qif-utils.scm
-share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/report-utilities.scm
-share/gnucash/scm/report.scm
-share/gnucash/scm/report/average-balance.scm
-share/gnucash/scm/report/balance-and-pnl.scm
-share/gnucash/scm/report/budget-report.scm
-share/gnucash/scm/report/folio.scm
-share/gnucash/scm/report/hello-world.scm
-share/gnucash/scm/report/report-list.scm
-share/gnucash/scm/report/transaction-report.scm
-share/gnucash/scm/slib-backup.scm
-share/gnucash/scm/srfi/srfi-1.r5rs.scm
-share/gnucash/scm/srfi/srfi-1.unclear.scm
-share/gnucash/scm/srfi/srfi-19.scm
-share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/srfi/srfi-8.scm
-share/gnucash/scm/startup.scm
-share/gnucash/scm/structure.scm
-share/gnucash/scm/substring-search.scm
-share/gnucash/scm/testbed.scm
-share/gnucash/scm/text-export.scm
-share/gnucash/scm/utilities.scm
-share/gnucash/scm/xml-generator.scm
+share/gnome/gnucash/doc/AUTHORS
+share/gnome/gnucash/doc/COPYING
+share/gnome/gnucash/doc/ChangeLog
+share/gnome/gnucash/doc/INSTALL
+share/gnome/gnucash/doc/NEWS
+share/gnome/gnucash/doc/README
+share/gnome/gnucash/doc/README.francais
+share/gnome/gnucash/doc/README.german
+share/gnome/gnucash/doc/examples/Money95bank_fr.qif
+share/gnome/gnucash/doc/examples/Money95invst_fr.qif
+share/gnome/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnome/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnome/gnucash/doc/examples/README
+share/gnome/gnucash/doc/examples/abc-all.qif
+share/gnome/gnucash/doc/examples/abc.qif
+share/gnome/gnucash/doc/examples/bogus.qif
+share/gnome/gnucash/doc/examples/cbb-export.qif
+share/gnome/gnucash/doc/examples/currency.xac
+share/gnome/gnucash/doc/examples/every.qif
+share/gnome/gnucash/doc/examples/ms-money.qif
+share/gnome/gnucash/doc/examples/quicktest.qif
+share/gnome/gnucash/doc/examples/splitdemo.xac
+share/gnome/gnucash/doc/examples/swipe.qif
+share/gnome/gnucash/doc/examples/test.xac
+share/gnome/gnucash/doc/examples/test2.xac
+share/gnome/gnucash/doc/examples/test3.xac
+share/gnome/gnucash/doc/examples/test4.xac
+share/gnome/gnucash/doc/examples/trading.xac
+share/gnome/gnucash/doc/examples/trading2.xac
+share/gnome/gnucash/doc/examples/web.qif
+share/gnome/gnucash/doc/examples/xfer.xac
+share/gnome/gnucash/doc/gnc.html
+share/gnome/gnucash/doc/guile-hackers.txt
+share/gnome/gnucash/html/C/RAW-NOTES
+share/gnome/gnucash/html/C/bofa-mym.html
+share/gnome/gnucash/html/C/image/appr-asset1.gif
+share/gnome/gnucash/html/C/image/appr-asset2.gif
+share/gnome/gnucash/html/C/image/appr-income.gif
+share/gnome/gnucash/html/C/image/appr-main1.gif
+share/gnome/gnucash/html/C/image/appr-main2.gif
+share/gnome/gnucash/html/C/image/bal-graph.gif
+share/gnome/gnucash/html/C/image/contract.gif
+share/gnome/gnucash/html/C/image/depr-asset.gif
+share/gnome/gnucash/html/C/image/depr-main.gif
+share/gnome/gnucash/html/C/image/expand.gif
+share/gnome/gnucash/html/C/image/foliowin-single.gif
+share/gnome/gnucash/html/C/image/foliowin.gif
+share/gnome/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnome/gnucash/html/C/image/logo-bullogogross.gif
+share/gnome/gnucash/html/C/image/logo-debian.jpg
+share/gnome/gnucash/html/C/image/logo-ibm.gif
+share/gnome/gnucash/html/C/image/logo-linux.gif
+share/gnome/gnucash/html/C/image/logo-sgi.gif
+share/gnome/gnucash/html/C/image/logo-skunkware.gif
+share/gnome/gnucash/html/C/image/newaccwin-code.gif
+share/gnome/gnucash/html/C/image/newaccwin-trade.gif
+share/gnome/gnucash/html/C/image/recnwin.gif
+share/gnome/gnucash/html/C/image/regwin-double.gif
+share/gnome/gnucash/html/C/image/regwin-multi.gif
+share/gnome/gnucash/html/C/image/regwin-single.gif
+share/gnome/gnucash/html/C/image/regwin-single2.gif
+share/gnome/gnucash/html/C/image/report-av-baln.gif
+share/gnome/gnucash/html/C/image/report-baln.gif
+share/gnome/gnucash/html/C/image/report-folio.gif
+share/gnome/gnucash/html/C/image/report-option.gif
+share/gnome/gnucash/html/C/image/report-pnl.gif
+share/gnome/gnucash/html/C/image/reportwin.gif
+share/gnome/gnucash/html/C/image/ticker-a.gif
+share/gnome/gnucash/html/C/image/ticker-b.gif
+share/gnome/gnucash/html/C/projects.html
+share/gnome/gnucash/html/C/xacc-about.html
+share/gnome/gnucash/html/C/xacc-accountedit.html
+share/gnome/gnucash/html/C/xacc-acctypes.html
+share/gnome/gnucash/html/C/xacc-accwin.html
+share/gnome/gnucash/html/C/xacc-adjbwin.html
+share/gnome/gnucash/html/C/xacc-apar.html
+share/gnome/gnucash/html/C/xacc-apprdepr.html
+share/gnome/gnucash/html/C/xacc-bal_tracker.html
+share/gnome/gnucash/html/C/xacc-balsheet.html
+share/gnome/gnucash/html/C/xacc-currency.html
+share/gnome/gnucash/html/C/xacc-date.html
+share/gnome/gnucash/html/C/xacc-double.html
+share/gnome/gnucash/html/C/xacc-euro.html
+share/gnome/gnucash/html/C/xacc-expense.html
+share/gnome/gnucash/html/C/xacc-find-transactions.html
+share/gnome/gnucash/html/C/xacc-globalprefs.html
+share/gnome/gnucash/html/C/xacc-globalprops.html
+share/gnome/gnucash/html/C/xacc-gpl.html
+share/gnome/gnucash/html/C/xacc-groups.html
+share/gnome/gnucash/html/C/xacc-main.html
+share/gnome/gnucash/html/C/xacc-mainwin.html
+share/gnome/gnucash/html/C/xacc-pnl.html
+share/gnome/gnucash/html/C/xacc-portfolio_report.html
+share/gnome/gnucash/html/C/xacc-print.html
+share/gnome/gnucash/html/C/xacc-qif-import.html
+share/gnome/gnucash/html/C/xacc-quicken.html
+share/gnome/gnucash/html/C/xacc-recnwin.html
+share/gnome/gnucash/html/C/xacc-regwin.html
+share/gnome/gnucash/html/C/xacc-regwin_kbd.html
+share/gnome/gnucash/html/C/xacc-reports.html
+share/gnome/gnucash/html/C/xacc-ticker.html
+share/gnome/gnucash/html/C/xacc-trans_report.html
+share/gnome/gnucash/html/C/xacc-y2k.html
+share/gnome/gnucash/html/fr/bofa-mym.html
+share/gnome/gnucash/html/fr/image/appr-asset1.gif
+share/gnome/gnucash/html/fr/image/appr-asset2.gif
+share/gnome/gnucash/html/fr/image/appr-income.gif
+share/gnome/gnucash/html/fr/image/appr-main1.gif
+share/gnome/gnucash/html/fr/image/appr-main2.gif
+share/gnome/gnucash/html/fr/image/contract.gif
+share/gnome/gnucash/html/fr/image/depr-asset.gif
+share/gnome/gnucash/html/fr/image/depr-main.gif
+share/gnome/gnucash/html/fr/image/expand.gif
+share/gnome/gnucash/html/fr/image/foliowin-single.gif
+share/gnome/gnucash/html/fr/image/foliowin.gif
+share/gnome/gnucash/html/fr/image/newaccwin-code.gif
+share/gnome/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnome/gnucash/html/fr/image/newaccwin.gif
+share/gnome/gnucash/html/fr/image/recnwin.gif
+share/gnome/gnucash/html/fr/image/regwin-double.gif
+share/gnome/gnucash/html/fr/image/regwin-multi.gif
+share/gnome/gnucash/html/fr/image/regwin-single.gif
+share/gnome/gnucash/html/fr/image/regwin-single2.gif
+share/gnome/gnucash/html/fr/image/regwin.gif
+share/gnome/gnucash/html/fr/image/report-baln.gif
+share/gnome/gnucash/html/fr/image/report-folio.gif
+share/gnome/gnucash/html/fr/image/report-option.gif
+share/gnome/gnucash/html/fr/image/reportwin.gif
+share/gnome/gnucash/html/fr/image/ticker-a.gif
+share/gnome/gnucash/html/fr/image/ticker-b.gif
+share/gnome/gnucash/html/fr/projects.html
+share/gnome/gnucash/html/fr/xacc-about.html
+share/gnome/gnucash/html/fr/xacc-accountedit.html
+share/gnome/gnucash/html/fr/xacc-acctypes.html
+share/gnome/gnucash/html/fr/xacc-accwin.html
+share/gnome/gnucash/html/fr/xacc-adjbwin.html
+share/gnome/gnucash/html/fr/xacc-apar.html
+share/gnome/gnucash/html/fr/xacc-apprdepr.html
+share/gnome/gnucash/html/fr/xacc-bal_tracker.html
+share/gnome/gnucash/html/fr/xacc-balsheet.html
+share/gnome/gnucash/html/fr/xacc-currency.html
+share/gnome/gnucash/html/fr/xacc-date.html
+share/gnome/gnucash/html/fr/xacc-double.html
+share/gnome/gnucash/html/fr/xacc-expense.html
+share/gnome/gnucash/html/fr/xacc-globalprefs.html
+share/gnome/gnucash/html/fr/xacc-gpl-fr.html
+share/gnome/gnucash/html/fr/xacc-gpl.html
+share/gnome/gnucash/html/fr/xacc-groups.html
+share/gnome/gnucash/html/fr/xacc-main.html
+share/gnome/gnucash/html/fr/xacc-mainwin.html
+share/gnome/gnucash/html/fr/xacc-pnl.html
+share/gnome/gnucash/html/fr/xacc-print.html
+share/gnome/gnucash/html/fr/xacc-quicken.html
+share/gnome/gnucash/html/fr/xacc-recnwin.html
+share/gnome/gnucash/html/fr/xacc-regwin.html
+share/gnome/gnucash/html/fr/xacc-reports.html
+share/gnome/gnucash/html/fr/xacc-ticker.html
+share/gnome/gnucash/html/fr/xacc-trans_report.html
+share/gnome/gnucash/html/fr/xacc-y2k.html
+share/gnome/gnucash/html/gnucash.css
+share/gnome/gnucash/html/index.html
+share/gnome/gnucash/perl/Quote.pm
+share/gnome/gnucash/perl/gnucash.pm
+share/gnome/gnucash/scm/bootstrap.scm
+share/gnome/gnucash/scm/bs-interp.scm
+share/gnome/gnucash/scm/c-interface.scm
+share/gnome/gnucash/scm/command-line.scm
+share/gnome/gnucash/scm/config-var.scm
+share/gnome/gnucash/scm/currencies.scm
+share/gnome/gnucash/scm/date-utilities.scm
+share/gnome/gnucash/scm/depend.scm
+share/gnome/gnucash/scm/doc.scm
+share/gnome/gnucash/scm/engine-interface.scm
+share/gnome/gnucash/scm/engine-utilities.scm
+share/gnome/gnucash/scm/extensions.scm
+share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm
+share/gnome/gnucash/scm/gnumeric/table-utils.scm
+share/gnome/gnucash/scm/graph.scm
+share/gnome/gnucash/scm/hooks.scm
+share/gnome/gnucash/scm/html-generator.scm
+share/gnome/gnucash/scm/main.scm
+share/gnome/gnucash/scm/options.scm
+share/gnome/gnucash/scm/path.scm
+share/gnome/gnucash/scm/prefs.scm
+share/gnome/gnucash/scm/printing/number-to-words.scm
+share/gnome/gnucash/scm/printing/print-check.scm
+share/gnome/gnucash/scm/qif-import/qif-dialog-utils.scm
+share/gnome/gnucash/scm/qif-import/qif-file.scm
+share/gnome/gnucash/scm/qif-import/qif-guess-map.scm
+share/gnome/gnucash/scm/qif-import/qif-import.scm
+share/gnome/gnucash/scm/qif-import/qif-objects.scm
+share/gnome/gnucash/scm/qif-import/qif-parse.scm
+share/gnome/gnucash/scm/qif-import/qif-to-gnc.scm
+share/gnome/gnucash/scm/qif-import/qif-utils.scm
+share/gnome/gnucash/scm/qif-import/simple-obj.scm
+share/gnome/gnucash/scm/report-utilities.scm
+share/gnome/gnucash/scm/report.scm
+share/gnome/gnucash/scm/report/average-balance.scm
+share/gnome/gnucash/scm/report/balance-and-pnl.scm
+share/gnome/gnucash/scm/report/budget-report.scm
+share/gnome/gnucash/scm/report/folio.scm
+share/gnome/gnucash/scm/report/hello-world.scm
+share/gnome/gnucash/scm/report/report-list.scm
+share/gnome/gnucash/scm/report/transaction-report.scm
+share/gnome/gnucash/scm/slib-backup.scm
+share/gnome/gnucash/scm/srfi/srfi-1.r5rs.scm
+share/gnome/gnucash/scm/srfi/srfi-1.unclear.scm
+share/gnome/gnucash/scm/srfi/srfi-19.scm
+share/gnome/gnucash/scm/srfi/srfi-8.guile.scm
+share/gnome/gnucash/scm/srfi/srfi-8.scm
+share/gnome/gnucash/scm/startup.scm
+share/gnome/gnucash/scm/structure.scm
+share/gnome/gnucash/scm/substring-search.scm
+share/gnome/gnucash/scm/testbed.scm
+share/gnome/gnucash/scm/text-export.scm
+share/gnome/gnucash/scm/utilities.scm
+share/gnome/gnucash/scm/xml-generator.scm
share/locale/de/LC_MESSAGES/gnucash.mo
share/locale/en_GB/LC_MESSAGES/gnucash.mo
share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -239,18 +239,18 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
@dirrm etc/gnucash
@dirrm lib/gnucash/perl
@dirrm lib/gnucash
-@dirrm share/gnucash/doc/examples
-@dirrm share/gnucash/doc
-@dirrm share/gnucash/html/C/image
-@dirrm share/gnucash/html/C
-@dirrm share/gnucash/html/fr/image
-@dirrm share/gnucash/html/fr
-@dirrm share/gnucash/html
-@dirrm share/gnucash/perl
-@dirrm share/gnucash/scm/gnumeric
-@dirrm share/gnucash/scm/printing
-@dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/srfi
-@dirrm share/gnucash/scm/report
-@dirrm share/gnucash/scm
-@dirrm share/gnucash
+@dirrm share/gnome/gnucash/doc/examples
+@dirrm share/gnome/gnucash/doc
+@dirrm share/gnome/gnucash/html/C/image
+@dirrm share/gnome/gnucash/html/C
+@dirrm share/gnome/gnucash/html/fr/image
+@dirrm share/gnome/gnucash/html/fr
+@dirrm share/gnome/gnucash/html
+@dirrm share/gnome/gnucash/perl
+@dirrm share/gnome/gnucash/scm/gnumeric
+@dirrm share/gnome/gnucash/scm/printing
+@dirrm share/gnome/gnucash/scm/qif-import
+@dirrm share/gnome/gnucash/scm/srfi
+@dirrm share/gnome/gnucash/scm/report
+@dirrm share/gnome/gnucash/scm
+@dirrm share/gnome/gnucash
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index b17b8dc4f29f..b17f7750660c 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -12,18 +12,23 @@ MASTER_SITES= http://home.ins.de/~m.hussmann/software/yank/
MAINTAINER= jedgar@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+PLIST_SUB= PORTVERSION=${PORTVERSION}
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+ @${PERL} -pi -e 's^-l(pthread|c_r)^-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^\$\(datadir\)/locale^\$\(prefix\)/share/locale^g'
+ @find ${WRKSRC}/src/Plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
+
.include <bsd.port.mk>
diff --git a/deskutils/yank/pkg-plist b/deskutils/yank/pkg-plist
index 4cb113ff5f66..baab9ccf4ee4 100644
--- a/deskutils/yank/pkg-plist
+++ b/deskutils/yank/pkg-plist
@@ -1,12 +1,10 @@
bin/yank
+lib/yank/plugins/%%PORTVERSION%%/libPgp5.so
share/gnome/apps/Applications/yank.desktop
share/gnome/pixmaps/yank.png
share/locale/de/LC_MESSAGES/yank.mo
share/locale/ja/LC_MESSAGES/yank.mo
share/locale/sv/LC_MESSAGES/yank.mo
-lib/yank/plugins/0.1.4/libPgp5.so.0
-lib/yank/plugins/0.1.4/libPgp5.so
-lib/yank/plugins/0.1.4/libPgp5.a
-@dirrm lib/yank/plugins/0.1.4
+@dirrm lib/yank/plugins/%%PORTVERSION%%
@dirrm lib/yank/plugins
@dirrm lib/yank
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 2f2bed1ade16..fc309fb6fa29 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -14,26 +14,17 @@ MASTER_SITE_SUBDIR= unstable/sources/bonobo
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gnomeprint.12:${PORTSDIR}/print/gnomeprint \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \
oaf.0:${PORTSDIR}/devel/oaf
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFILES= configure libefs/configure
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index ec9caf4f7e44..d20427919e0b 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -14,14 +14,12 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index ec9caf4f7e44..d20427919e0b 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -14,14 +14,12 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index ec9caf4f7e44..d20427919e0b 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -14,14 +14,12 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 621e0b84dc7b..bec890d21515 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -14,26 +14,17 @@ DISTNAME= GConf-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml \
- popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
guile.9:${PORTSDIR}/lang/guile \
oaf.0:${PORTSDIR}/devel/oaf \
iconv.1:${PORTSDIR}/converters/iconv
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
+USE_GNOME= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib -liconv"
pre-patch:
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 621e0b84dc7b..bec890d21515 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -14,26 +14,17 @@ DISTNAME= GConf-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml \
- popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
guile.9:${PORTSDIR}/lang/guile \
oaf.0:${PORTSDIR}/devel/oaf \
iconv.1:${PORTSDIR}/converters/iconv
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
+USE_GNOME= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib -liconv"
pre-patch:
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 12d3a3ee6cd3..baa952b41160 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -13,19 +13,14 @@ MASTER_SITE_SUBDIR= unstable/sources/gIDE
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \
guile.9:${PORTSDIR}/lang/guile
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gide.1 gdbio.1
@@ -34,12 +29,12 @@ PLIST_SUB= VERSION=${PORTVERSION}
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ 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 ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-post-patch:
@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
diff --git a/devel/gide/files/patch-bb b/devel/gide/files/patch-bb
index 28789b97b335..dc537e6b474f 100644
--- a/devel/gide/files/patch-bb
+++ b/devel/gide/files/patch-bb
@@ -12,25 +12,3 @@
if eval "test \"`echo '$''{'am_cv_gnu_regex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -5163,15 +5164,15 @@
- fi
-
-
-- USE_INCLUDED_LIBINTL=yes
-+ USE_INCLUDED_LIBINTL=no
- CATOBJEXT=.gmo
- INSTOBJEXT=.mo
- DATADIRNAME=share
-- INTLDEPS='$(top_builddir)/intl/libintl.a'
-- INTLLIBS=$INTLDEPS
-- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-- nls_cv_header_intl=intl/libintl.h
-- nls_cv_header_libgt=intl/libgettext.h
-+ INTLDEPS=
-+ INTLLIBS=
-+ LIBS='-lintl'
-+ nls_cv_header_intl=
-+ nls_cv_header_libgt=
- fi
-
- if test "$XGETTEXT" != ":"; then
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index cbf755a0f200..46540636d01a 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -13,17 +13,22 @@ MASTER_SITE_SUBDIR= stable/sources/glade
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
FETCH_BEFORE_ARGS= -b
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/libs"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -e \
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/\@PACKAGE\@|\$\(prefix\)/share/\@PACKAGE\@|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
.include <bsd.port.mk>
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index 0b3b4f6c7b1b..8db740474c64 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -139,7 +139,6 @@ share/locale/uk/LC_MESSAGES/glade.mo
@dirrm share/gnome/help/glade/C/faq
@dirrm share/gnome/help/glade/C
@dirrm share/gnome/help/glade
-@unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
@dirrm share/glade/gtk
@dirrm share/glade/gnome
@dirrm share/glade
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index cbf755a0f200..46540636d01a 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -13,17 +13,22 @@ MASTER_SITE_SUBDIR= stable/sources/glade
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
FETCH_BEFORE_ARGS= -b
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/libs"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -e \
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/\@PACKAGE\@|\$\(prefix\)/share/\@PACKAGE\@|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
.include <bsd.port.mk>
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index 0b3b4f6c7b1b..8db740474c64 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -139,7 +139,6 @@ share/locale/uk/LC_MESSAGES/glade.mo
@dirrm share/gnome/help/glade/C/faq
@dirrm share/gnome/help/glade/C
@dirrm share/gnome/help/glade
-@unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
@dirrm share/glade/gtk
@dirrm share/glade/gnome
@dirrm share/glade
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -14,25 +14,17 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --disable-gconf
+CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN5= gnome-vfs-mime.5
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -14,25 +14,17 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --disable-gconf
+CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN5= gnome-vfs-mime.5
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -14,25 +14,17 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --disable-gconf
+CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN5= gnome-vfs-mime.5
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -14,25 +14,17 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --disable-gconf
+CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN5= gnome-vfs-mime.5
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 49657e41be92..65b3f6e1fda8 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -14,24 +14,16 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- oaf.0:${PORTSDIR}/devel/oaf
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- gmc:${PORTSDIR}/x11-fm/gnomemc
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= oaf.0:${PORTSDIR}/devel/oaf
+RUN_DEPENDS= gmc:${PORTSDIR}/x11-fm/gnomemc
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+ LIBS="-L${LOCALBASE}/lib"
MAN1= gtranslator.1
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 172e7d4c2ccb..c4beaba3469b 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -13,17 +13,14 @@ MASTER_SITE_SUBDIR= stable/sources/libglade
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
USE_PERL5= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab
index 83ac017513a8..ca9e9529d029 100644
--- a/devel/libglade/files/patch-ab
+++ b/devel/libglade/files/patch-ab
@@ -7,7 +7,8 @@
-SUBDIRS = intl po macros glade doc
+SUBDIRS = intl po macros glade
- m4datadir = $(datadir)/aclocal
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
m4data_DATA = libglade.m4
-confexecdir = $(libdir)
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 172e7d4c2ccb..c4beaba3469b 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -13,17 +13,14 @@ MASTER_SITE_SUBDIR= stable/sources/libglade
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
USE_PERL5= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index 83ac017513a8..ca9e9529d029 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -7,7 +7,8 @@
-SUBDIRS = intl po macros glade doc
+SUBDIRS = intl po macros glade
- m4datadir = $(datadir)/aclocal
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
m4data_DATA = libglade.m4
-confexecdir = $(libdir)
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 27fe508006a6..75d5749b66b0 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -13,18 +13,15 @@ MASTER_SITE_SUBDIR= stable/sources/libgtop
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- guile.9:${PORTSDIR}/lang/guile
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_PERL5= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 27fe508006a6..75d5749b66b0 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -13,18 +13,15 @@ MASTER_SITE_SUBDIR= stable/sources/libgtop
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- guile.9:${PORTSDIR}/lang/guile
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_PERL5= yes
USE_GMAKE= yes
+USE_GNOMELIBS= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index eb527a624bbb..127fc7423c9c 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -12,18 +12,20 @@ MASTER_SITES= http://home.earthlink.net/~nawalker/pharmacy/
MAINTAINER= jedgar@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-x
-CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
+CONFIGURE_ENV+= CPPCFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -e \
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
.include <bsd.port.mk>
diff --git a/devel/pharmacy/pkg-plist b/devel/pharmacy/pkg-plist
index 848c8bccfda5..a61bd4fcd76a 100644
--- a/devel/pharmacy/pkg-plist
+++ b/devel/pharmacy/pkg-plist
@@ -11,7 +11,7 @@ share/gnome/help/pharmacy/C/topic.dat
share/gnome/help/pharmacy/C/update.html
share/gnome/help/pharmacy/C/using.html
share/gnome/help/pharmacy/C/web.html
-share/pixmaps/pharmacy.png
+share/gnome/pixmaps/pharmacy.png
share/locale/de/LC_MESSAGES/pharmacy.mo
share/locale/fr/LC_MESSAGES/pharmacy.mo
share/locale/ko/LC_MESSAGES/pharmacy.mo
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index e596049c4c1e..1392f1504760 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -13,19 +13,14 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= iconv.1:${PORTSDIR}/converters/iconv \
- gnome.4:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS= iconv.1:${PORTSDIR}/converters/iconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASSE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib -liconv"
MAN1= dedit.1
@@ -35,8 +30,8 @@ MANLANG= "" ja
post-install:
.if defined(KANJI)
- ${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 \
- ${PREFIX}/man/ja/man1/dedit.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 \
+ ${PREFIX}/man/ja/man1/dedit.1
.endif
.include <bsd.port.mk>
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 32d9ef4fc029..8293cc0e43f4 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -13,21 +13,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gnomeprint.12:${PORTSDIR}/print/gnomeprint \
+LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \
glade.4:${PORTSDIR}/devel/libglade
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gedit.1
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 32d9ef4fc029..8293cc0e43f4 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -13,21 +13,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gnomeprint.12:${PORTSDIR}/print/gnomeprint \
+LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \
glade.4:${PORTSDIR}/devel/libglade
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gedit.1
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 5d11a55ee75c..296760145e6d 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -13,22 +13,15 @@ MASTER_SITE_SUBDIR= stable/sources/ghex
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gnomeprint.12:${PORTSDIR}/print/gnomeprint
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint
BROKEN= "Uses internals from gnomeprint that are no longer present"
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 5d11a55ee75c..296760145e6d 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -13,22 +13,15 @@ MASTER_SITE_SUBDIR= stable/sources/ghex
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gnomeprint.12:${PORTSDIR}/print/gnomeprint
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint
BROKEN= "Uses internals from gnomeprint that are no longer present"
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index dd25599107ea..d0d7f8d5fca7 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -14,22 +14,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
USE_PYTHON= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index c91fda4affdf..318b4f51ee8f 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -14,20 +14,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+
ALL_TARGET= clean all
post-extract:
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index ee50298608c7..c7d26ec5c177 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -13,17 +13,24 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
-USE_LIBTOOL= yes
USE_GMAKE= yes
+USE_GNOME= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
MAN1= gnofin.1
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -e \
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+ s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+ @find ${WRKSRC}/plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
.include <bsd.port.mk>
diff --git a/finance/gnofin/pkg-plist b/finance/gnofin/pkg-plist
index 02138384f313..acabc7d57fd0 100644
--- a/finance/gnofin/pkg-plist
+++ b/finance/gnofin/pkg-plist
@@ -1,28 +1,13 @@
bin/gnofin
-lib/gnofin/plugins/libqif.so.0
-lib/gnofin/plugins/libqif.so
-lib/gnofin/plugins/libqif.a
-lib/gnofin/plugins/libhtml.so.0
-lib/gnofin/plugins/libhtml.so
-lib/gnofin/plugins/libhtml.a
-lib/gnofin/plugins/liblatex.so.0
-lib/gnofin/plugins/liblatex.so
-lib/gnofin/plugins/liblatex.a
-lib/gnofin/plugins/libtext.so.0
-lib/gnofin/plugins/libtext.so
-lib/gnofin/plugins/libtext.a
-lib/gnofin/plugins/libcbb.so.0
lib/gnofin/plugins/libcbb.so
-lib/gnofin/plugins/libcbb.a
-lib/gnofin/plugins/libfind.so.0
lib/gnofin/plugins/libfind.so
-lib/gnofin/plugins/libfind.a
-lib/gnofin/plugins/libreconcile.so.0
+lib/gnofin/plugins/libhtml.so
+lib/gnofin/plugins/liblatex.so
+lib/gnofin/plugins/libqif.so
lib/gnofin/plugins/libreconcile.so
-lib/gnofin/plugins/libreconcile.a
-lib/gnofin/plugins/libsched.so.0
lib/gnofin/plugins/libsched.so
-lib/gnofin/plugins/libsched.a
+lib/gnofin/plugins/libtext.so
share/gnome/apps/Applications/gnofin.desktop
+share/locale/fr/LC_MESSAGES/gnofin.mo
@dirrm lib/gnofin/plugins
@dirrm lib/gnofin
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 9f69b20d6a7e..ef1f3fa38ea4 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -19,30 +19,34 @@ MAINTAINER= ade@FreeBSD.org
BUILD_DEPENDS= swig:${PORTSDIR}/devel/SWIG \
g-wrap:${PORTSDIR}/devel/g-wrap \
eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- guile.9:${PORTSDIR}/lang/guile
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
RUN_DEPENDS= slib48:${PORTSDIR}/lang/slib \
gnuplot:${PORTSDIR}/math/gnuplot \
${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww
site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+USE_X_PREFIX= yes
USE_GMAKE= yes
USE_XPM= yes
-USE_X_PREFIX= yes
USE_PERL5= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-CONFIGURE_ENV= MAKE=gmake \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}"
CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
MAN1= gnc-prices.1 gnucash.1
+pre-patch:
+ @${PERL} -pi -e 's^-l(pthread|c_r)^-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^\$\{datadir\}/aclocal^\$\(prefix\)/share/aclocal^g ; \
+ s^\$\{datadir\}/locale^\$\(prefix\)/share/locale^g'
post-install:
@strip ${PREFIX}/bin/gnucash
diff --git a/finance/gnucash-devel/pkg-plist b/finance/gnucash-devel/pkg-plist
index af03769fe596..bf9f7520019b 100644
--- a/finance/gnucash-devel/pkg-plist
+++ b/finance/gnucash-devel/pkg-plist
@@ -11,223 +11,223 @@ lib/gnucash/perl/libgncswig.so.1
@exec /sbin/ldconfig -m %D/lib/gnucash
@unexec /sbin/ldconfig -R
share/gnome/apps/Applications/gnucash.desktop
-share/gnucash/doc/AUTHORS
-share/gnucash/doc/COPYING
-share/gnucash/doc/ChangeLog
-share/gnucash/doc/INSTALL
-share/gnucash/doc/NEWS
-share/gnucash/doc/README
-share/gnucash/doc/README.francais
-share/gnucash/doc/README.german
-share/gnucash/doc/examples/Money95bank_fr.qif
-share/gnucash/doc/examples/Money95invst_fr.qif
-share/gnucash/doc/examples/Money95mfunds_fr.qif
-share/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnucash/doc/examples/README
-share/gnucash/doc/examples/abc-all.qif
-share/gnucash/doc/examples/abc.qif
-share/gnucash/doc/examples/bogus.qif
-share/gnucash/doc/examples/cbb-export.qif
-share/gnucash/doc/examples/currency.xac
-share/gnucash/doc/examples/every.qif
-share/gnucash/doc/examples/ms-money.qif
-share/gnucash/doc/examples/quicktest.qif
-share/gnucash/doc/examples/splitdemo.xac
-share/gnucash/doc/examples/swipe.qif
-share/gnucash/doc/examples/test.xac
-share/gnucash/doc/examples/test2.xac
-share/gnucash/doc/examples/test3.xac
-share/gnucash/doc/examples/test4.xac
-share/gnucash/doc/examples/trading.xac
-share/gnucash/doc/examples/trading2.xac
-share/gnucash/doc/examples/web.qif
-share/gnucash/doc/examples/xfer.xac
-share/gnucash/doc/gnc.html
-share/gnucash/doc/guile-hackers.txt
-share/gnucash/html/C/RAW-NOTES
-share/gnucash/html/C/bofa-mym.html
-share/gnucash/html/C/image/appr-asset1.gif
-share/gnucash/html/C/image/appr-asset2.gif
-share/gnucash/html/C/image/appr-income.gif
-share/gnucash/html/C/image/appr-main1.gif
-share/gnucash/html/C/image/appr-main2.gif
-share/gnucash/html/C/image/bal-graph.gif
-share/gnucash/html/C/image/contract.gif
-share/gnucash/html/C/image/depr-asset.gif
-share/gnucash/html/C/image/depr-main.gif
-share/gnucash/html/C/image/expand.gif
-share/gnucash/html/C/image/foliowin-single.gif
-share/gnucash/html/C/image/foliowin.gif
-share/gnucash/html/C/image/logo-NetBSD-banner.gif
-share/gnucash/html/C/image/logo-bullogogross.gif
-share/gnucash/html/C/image/logo-debian.jpg
-share/gnucash/html/C/image/logo-ibm.gif
-share/gnucash/html/C/image/logo-linux.gif
-share/gnucash/html/C/image/logo-sgi.gif
-share/gnucash/html/C/image/logo-skunkware.gif
-share/gnucash/html/C/image/newaccwin-code.gif
-share/gnucash/html/C/image/newaccwin-trade.gif
-share/gnucash/html/C/image/recnwin.gif
-share/gnucash/html/C/image/regwin-double.gif
-share/gnucash/html/C/image/regwin-multi.gif
-share/gnucash/html/C/image/regwin-single.gif
-share/gnucash/html/C/image/regwin-single2.gif
-share/gnucash/html/C/image/report-av-baln.gif
-share/gnucash/html/C/image/report-baln.gif
-share/gnucash/html/C/image/report-folio.gif
-share/gnucash/html/C/image/report-option.gif
-share/gnucash/html/C/image/report-pnl.gif
-share/gnucash/html/C/image/reportwin.gif
-share/gnucash/html/C/image/ticker-a.gif
-share/gnucash/html/C/image/ticker-b.gif
-share/gnucash/html/C/projects.html
-share/gnucash/html/C/xacc-about.html
-share/gnucash/html/C/xacc-accountedit.html
-share/gnucash/html/C/xacc-acctypes.html
-share/gnucash/html/C/xacc-accwin.html
-share/gnucash/html/C/xacc-adjbwin.html
-share/gnucash/html/C/xacc-apar.html
-share/gnucash/html/C/xacc-apprdepr.html
-share/gnucash/html/C/xacc-bal_tracker.html
-share/gnucash/html/C/xacc-balsheet.html
-share/gnucash/html/C/xacc-currency.html
-share/gnucash/html/C/xacc-date.html
-share/gnucash/html/C/xacc-double.html
-share/gnucash/html/C/xacc-euro.html
-share/gnucash/html/C/xacc-expense.html
-share/gnucash/html/C/xacc-find-transactions.html
-share/gnucash/html/C/xacc-globalprefs.html
-share/gnucash/html/C/xacc-globalprops.html
-share/gnucash/html/C/xacc-gpl.html
-share/gnucash/html/C/xacc-groups.html
-share/gnucash/html/C/xacc-main.html
-share/gnucash/html/C/xacc-mainwin.html
-share/gnucash/html/C/xacc-pnl.html
-share/gnucash/html/C/xacc-portfolio_report.html
-share/gnucash/html/C/xacc-print.html
-share/gnucash/html/C/xacc-qif-import.html
-share/gnucash/html/C/xacc-quicken.html
-share/gnucash/html/C/xacc-recnwin.html
-share/gnucash/html/C/xacc-regwin.html
-share/gnucash/html/C/xacc-regwin_kbd.html
-share/gnucash/html/C/xacc-reports.html
-share/gnucash/html/C/xacc-ticker.html
-share/gnucash/html/C/xacc-trans_report.html
-share/gnucash/html/C/xacc-y2k.html
-share/gnucash/html/fr/bofa-mym.html
-share/gnucash/html/fr/image/appr-asset1.gif
-share/gnucash/html/fr/image/appr-asset2.gif
-share/gnucash/html/fr/image/appr-income.gif
-share/gnucash/html/fr/image/appr-main1.gif
-share/gnucash/html/fr/image/appr-main2.gif
-share/gnucash/html/fr/image/contract.gif
-share/gnucash/html/fr/image/depr-asset.gif
-share/gnucash/html/fr/image/depr-main.gif
-share/gnucash/html/fr/image/expand.gif
-share/gnucash/html/fr/image/foliowin-single.gif
-share/gnucash/html/fr/image/foliowin.gif
-share/gnucash/html/fr/image/newaccwin-code.gif
-share/gnucash/html/fr/image/newaccwin-trade.gif
-share/gnucash/html/fr/image/newaccwin.gif
-share/gnucash/html/fr/image/recnwin.gif
-share/gnucash/html/fr/image/regwin-double.gif
-share/gnucash/html/fr/image/regwin-multi.gif
-share/gnucash/html/fr/image/regwin-single.gif
-share/gnucash/html/fr/image/regwin-single2.gif
-share/gnucash/html/fr/image/regwin.gif
-share/gnucash/html/fr/image/report-baln.gif
-share/gnucash/html/fr/image/report-folio.gif
-share/gnucash/html/fr/image/report-option.gif
-share/gnucash/html/fr/image/reportwin.gif
-share/gnucash/html/fr/image/ticker-a.gif
-share/gnucash/html/fr/image/ticker-b.gif
-share/gnucash/html/fr/projects.html
-share/gnucash/html/fr/xacc-about.html
-share/gnucash/html/fr/xacc-accountedit.html
-share/gnucash/html/fr/xacc-acctypes.html
-share/gnucash/html/fr/xacc-accwin.html
-share/gnucash/html/fr/xacc-adjbwin.html
-share/gnucash/html/fr/xacc-apar.html
-share/gnucash/html/fr/xacc-apprdepr.html
-share/gnucash/html/fr/xacc-bal_tracker.html
-share/gnucash/html/fr/xacc-balsheet.html
-share/gnucash/html/fr/xacc-currency.html
-share/gnucash/html/fr/xacc-date.html
-share/gnucash/html/fr/xacc-double.html
-share/gnucash/html/fr/xacc-expense.html
-share/gnucash/html/fr/xacc-globalprefs.html
-share/gnucash/html/fr/xacc-gpl-fr.html
-share/gnucash/html/fr/xacc-gpl.html
-share/gnucash/html/fr/xacc-groups.html
-share/gnucash/html/fr/xacc-main.html
-share/gnucash/html/fr/xacc-mainwin.html
-share/gnucash/html/fr/xacc-pnl.html
-share/gnucash/html/fr/xacc-print.html
-share/gnucash/html/fr/xacc-quicken.html
-share/gnucash/html/fr/xacc-recnwin.html
-share/gnucash/html/fr/xacc-regwin.html
-share/gnucash/html/fr/xacc-reports.html
-share/gnucash/html/fr/xacc-ticker.html
-share/gnucash/html/fr/xacc-trans_report.html
-share/gnucash/html/fr/xacc-y2k.html
-share/gnucash/html/gnucash.css
-share/gnucash/html/index.html
-share/gnucash/perl/Quote.pm
-share/gnucash/perl/gnucash.pm
-share/gnucash/scm/bootstrap.scm
-share/gnucash/scm/bs-interp.scm
-share/gnucash/scm/c-interface.scm
-share/gnucash/scm/command-line.scm
-share/gnucash/scm/config-var.scm
-share/gnucash/scm/currencies.scm
-share/gnucash/scm/date-utilities.scm
-share/gnucash/scm/depend.scm
-share/gnucash/scm/doc.scm
-share/gnucash/scm/engine-interface.scm
-share/gnucash/scm/engine-utilities.scm
-share/gnucash/scm/extensions.scm
-share/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnucash/scm/gnumeric/table-utils.scm
-share/gnucash/scm/graph.scm
-share/gnucash/scm/hooks.scm
-share/gnucash/scm/html-generator.scm
-share/gnucash/scm/main.scm
-share/gnucash/scm/options.scm
-share/gnucash/scm/path.scm
-share/gnucash/scm/prefs.scm
-share/gnucash/scm/printing/number-to-words.scm
-share/gnucash/scm/printing/print-check.scm
-share/gnucash/scm/qif-import/qif-dialog-utils.scm
-share/gnucash/scm/qif-import/qif-file.scm
-share/gnucash/scm/qif-import/qif-guess-map.scm
-share/gnucash/scm/qif-import/qif-import.scm
-share/gnucash/scm/qif-import/qif-objects.scm
-share/gnucash/scm/qif-import/qif-parse.scm
-share/gnucash/scm/qif-import/qif-to-gnc.scm
-share/gnucash/scm/qif-import/qif-utils.scm
-share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/report-utilities.scm
-share/gnucash/scm/report.scm
-share/gnucash/scm/report/average-balance.scm
-share/gnucash/scm/report/balance-and-pnl.scm
-share/gnucash/scm/report/budget-report.scm
-share/gnucash/scm/report/folio.scm
-share/gnucash/scm/report/hello-world.scm
-share/gnucash/scm/report/report-list.scm
-share/gnucash/scm/report/transaction-report.scm
-share/gnucash/scm/slib-backup.scm
-share/gnucash/scm/srfi/srfi-1.r5rs.scm
-share/gnucash/scm/srfi/srfi-1.unclear.scm
-share/gnucash/scm/srfi/srfi-19.scm
-share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/srfi/srfi-8.scm
-share/gnucash/scm/startup.scm
-share/gnucash/scm/structure.scm
-share/gnucash/scm/substring-search.scm
-share/gnucash/scm/testbed.scm
-share/gnucash/scm/text-export.scm
-share/gnucash/scm/utilities.scm
-share/gnucash/scm/xml-generator.scm
+share/gnome/gnucash/doc/AUTHORS
+share/gnome/gnucash/doc/COPYING
+share/gnome/gnucash/doc/ChangeLog
+share/gnome/gnucash/doc/INSTALL
+share/gnome/gnucash/doc/NEWS
+share/gnome/gnucash/doc/README
+share/gnome/gnucash/doc/README.francais
+share/gnome/gnucash/doc/README.german
+share/gnome/gnucash/doc/examples/Money95bank_fr.qif
+share/gnome/gnucash/doc/examples/Money95invst_fr.qif
+share/gnome/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnome/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnome/gnucash/doc/examples/README
+share/gnome/gnucash/doc/examples/abc-all.qif
+share/gnome/gnucash/doc/examples/abc.qif
+share/gnome/gnucash/doc/examples/bogus.qif
+share/gnome/gnucash/doc/examples/cbb-export.qif
+share/gnome/gnucash/doc/examples/currency.xac
+share/gnome/gnucash/doc/examples/every.qif
+share/gnome/gnucash/doc/examples/ms-money.qif
+share/gnome/gnucash/doc/examples/quicktest.qif
+share/gnome/gnucash/doc/examples/splitdemo.xac
+share/gnome/gnucash/doc/examples/swipe.qif
+share/gnome/gnucash/doc/examples/test.xac
+share/gnome/gnucash/doc/examples/test2.xac
+share/gnome/gnucash/doc/examples/test3.xac
+share/gnome/gnucash/doc/examples/test4.xac
+share/gnome/gnucash/doc/examples/trading.xac
+share/gnome/gnucash/doc/examples/trading2.xac
+share/gnome/gnucash/doc/examples/web.qif
+share/gnome/gnucash/doc/examples/xfer.xac
+share/gnome/gnucash/doc/gnc.html
+share/gnome/gnucash/doc/guile-hackers.txt
+share/gnome/gnucash/html/C/RAW-NOTES
+share/gnome/gnucash/html/C/bofa-mym.html
+share/gnome/gnucash/html/C/image/appr-asset1.gif
+share/gnome/gnucash/html/C/image/appr-asset2.gif
+share/gnome/gnucash/html/C/image/appr-income.gif
+share/gnome/gnucash/html/C/image/appr-main1.gif
+share/gnome/gnucash/html/C/image/appr-main2.gif
+share/gnome/gnucash/html/C/image/bal-graph.gif
+share/gnome/gnucash/html/C/image/contract.gif
+share/gnome/gnucash/html/C/image/depr-asset.gif
+share/gnome/gnucash/html/C/image/depr-main.gif
+share/gnome/gnucash/html/C/image/expand.gif
+share/gnome/gnucash/html/C/image/foliowin-single.gif
+share/gnome/gnucash/html/C/image/foliowin.gif
+share/gnome/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnome/gnucash/html/C/image/logo-bullogogross.gif
+share/gnome/gnucash/html/C/image/logo-debian.jpg
+share/gnome/gnucash/html/C/image/logo-ibm.gif
+share/gnome/gnucash/html/C/image/logo-linux.gif
+share/gnome/gnucash/html/C/image/logo-sgi.gif
+share/gnome/gnucash/html/C/image/logo-skunkware.gif
+share/gnome/gnucash/html/C/image/newaccwin-code.gif
+share/gnome/gnucash/html/C/image/newaccwin-trade.gif
+share/gnome/gnucash/html/C/image/recnwin.gif
+share/gnome/gnucash/html/C/image/regwin-double.gif
+share/gnome/gnucash/html/C/image/regwin-multi.gif
+share/gnome/gnucash/html/C/image/regwin-single.gif
+share/gnome/gnucash/html/C/image/regwin-single2.gif
+share/gnome/gnucash/html/C/image/report-av-baln.gif
+share/gnome/gnucash/html/C/image/report-baln.gif
+share/gnome/gnucash/html/C/image/report-folio.gif
+share/gnome/gnucash/html/C/image/report-option.gif
+share/gnome/gnucash/html/C/image/report-pnl.gif
+share/gnome/gnucash/html/C/image/reportwin.gif
+share/gnome/gnucash/html/C/image/ticker-a.gif
+share/gnome/gnucash/html/C/image/ticker-b.gif
+share/gnome/gnucash/html/C/projects.html
+share/gnome/gnucash/html/C/xacc-about.html
+share/gnome/gnucash/html/C/xacc-accountedit.html
+share/gnome/gnucash/html/C/xacc-acctypes.html
+share/gnome/gnucash/html/C/xacc-accwin.html
+share/gnome/gnucash/html/C/xacc-adjbwin.html
+share/gnome/gnucash/html/C/xacc-apar.html
+share/gnome/gnucash/html/C/xacc-apprdepr.html
+share/gnome/gnucash/html/C/xacc-bal_tracker.html
+share/gnome/gnucash/html/C/xacc-balsheet.html
+share/gnome/gnucash/html/C/xacc-currency.html
+share/gnome/gnucash/html/C/xacc-date.html
+share/gnome/gnucash/html/C/xacc-double.html
+share/gnome/gnucash/html/C/xacc-euro.html
+share/gnome/gnucash/html/C/xacc-expense.html
+share/gnome/gnucash/html/C/xacc-find-transactions.html
+share/gnome/gnucash/html/C/xacc-globalprefs.html
+share/gnome/gnucash/html/C/xacc-globalprops.html
+share/gnome/gnucash/html/C/xacc-gpl.html
+share/gnome/gnucash/html/C/xacc-groups.html
+share/gnome/gnucash/html/C/xacc-main.html
+share/gnome/gnucash/html/C/xacc-mainwin.html
+share/gnome/gnucash/html/C/xacc-pnl.html
+share/gnome/gnucash/html/C/xacc-portfolio_report.html
+share/gnome/gnucash/html/C/xacc-print.html
+share/gnome/gnucash/html/C/xacc-qif-import.html
+share/gnome/gnucash/html/C/xacc-quicken.html
+share/gnome/gnucash/html/C/xacc-recnwin.html
+share/gnome/gnucash/html/C/xacc-regwin.html
+share/gnome/gnucash/html/C/xacc-regwin_kbd.html
+share/gnome/gnucash/html/C/xacc-reports.html
+share/gnome/gnucash/html/C/xacc-ticker.html
+share/gnome/gnucash/html/C/xacc-trans_report.html
+share/gnome/gnucash/html/C/xacc-y2k.html
+share/gnome/gnucash/html/fr/bofa-mym.html
+share/gnome/gnucash/html/fr/image/appr-asset1.gif
+share/gnome/gnucash/html/fr/image/appr-asset2.gif
+share/gnome/gnucash/html/fr/image/appr-income.gif
+share/gnome/gnucash/html/fr/image/appr-main1.gif
+share/gnome/gnucash/html/fr/image/appr-main2.gif
+share/gnome/gnucash/html/fr/image/contract.gif
+share/gnome/gnucash/html/fr/image/depr-asset.gif
+share/gnome/gnucash/html/fr/image/depr-main.gif
+share/gnome/gnucash/html/fr/image/expand.gif
+share/gnome/gnucash/html/fr/image/foliowin-single.gif
+share/gnome/gnucash/html/fr/image/foliowin.gif
+share/gnome/gnucash/html/fr/image/newaccwin-code.gif
+share/gnome/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnome/gnucash/html/fr/image/newaccwin.gif
+share/gnome/gnucash/html/fr/image/recnwin.gif
+share/gnome/gnucash/html/fr/image/regwin-double.gif
+share/gnome/gnucash/html/fr/image/regwin-multi.gif
+share/gnome/gnucash/html/fr/image/regwin-single.gif
+share/gnome/gnucash/html/fr/image/regwin-single2.gif
+share/gnome/gnucash/html/fr/image/regwin.gif
+share/gnome/gnucash/html/fr/image/report-baln.gif
+share/gnome/gnucash/html/fr/image/report-folio.gif
+share/gnome/gnucash/html/fr/image/report-option.gif
+share/gnome/gnucash/html/fr/image/reportwin.gif
+share/gnome/gnucash/html/fr/image/ticker-a.gif
+share/gnome/gnucash/html/fr/image/ticker-b.gif
+share/gnome/gnucash/html/fr/projects.html
+share/gnome/gnucash/html/fr/xacc-about.html
+share/gnome/gnucash/html/fr/xacc-accountedit.html
+share/gnome/gnucash/html/fr/xacc-acctypes.html
+share/gnome/gnucash/html/fr/xacc-accwin.html
+share/gnome/gnucash/html/fr/xacc-adjbwin.html
+share/gnome/gnucash/html/fr/xacc-apar.html
+share/gnome/gnucash/html/fr/xacc-apprdepr.html
+share/gnome/gnucash/html/fr/xacc-bal_tracker.html
+share/gnome/gnucash/html/fr/xacc-balsheet.html
+share/gnome/gnucash/html/fr/xacc-currency.html
+share/gnome/gnucash/html/fr/xacc-date.html
+share/gnome/gnucash/html/fr/xacc-double.html
+share/gnome/gnucash/html/fr/xacc-expense.html
+share/gnome/gnucash/html/fr/xacc-globalprefs.html
+share/gnome/gnucash/html/fr/xacc-gpl-fr.html
+share/gnome/gnucash/html/fr/xacc-gpl.html
+share/gnome/gnucash/html/fr/xacc-groups.html
+share/gnome/gnucash/html/fr/xacc-main.html
+share/gnome/gnucash/html/fr/xacc-mainwin.html
+share/gnome/gnucash/html/fr/xacc-pnl.html
+share/gnome/gnucash/html/fr/xacc-print.html
+share/gnome/gnucash/html/fr/xacc-quicken.html
+share/gnome/gnucash/html/fr/xacc-recnwin.html
+share/gnome/gnucash/html/fr/xacc-regwin.html
+share/gnome/gnucash/html/fr/xacc-reports.html
+share/gnome/gnucash/html/fr/xacc-ticker.html
+share/gnome/gnucash/html/fr/xacc-trans_report.html
+share/gnome/gnucash/html/fr/xacc-y2k.html
+share/gnome/gnucash/html/gnucash.css
+share/gnome/gnucash/html/index.html
+share/gnome/gnucash/perl/Quote.pm
+share/gnome/gnucash/perl/gnucash.pm
+share/gnome/gnucash/scm/bootstrap.scm
+share/gnome/gnucash/scm/bs-interp.scm
+share/gnome/gnucash/scm/c-interface.scm
+share/gnome/gnucash/scm/command-line.scm
+share/gnome/gnucash/scm/config-var.scm
+share/gnome/gnucash/scm/currencies.scm
+share/gnome/gnucash/scm/date-utilities.scm
+share/gnome/gnucash/scm/depend.scm
+share/gnome/gnucash/scm/doc.scm
+share/gnome/gnucash/scm/engine-interface.scm
+share/gnome/gnucash/scm/engine-utilities.scm
+share/gnome/gnucash/scm/extensions.scm
+share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm
+share/gnome/gnucash/scm/gnumeric/table-utils.scm
+share/gnome/gnucash/scm/graph.scm
+share/gnome/gnucash/scm/hooks.scm
+share/gnome/gnucash/scm/html-generator.scm
+share/gnome/gnucash/scm/main.scm
+share/gnome/gnucash/scm/options.scm
+share/gnome/gnucash/scm/path.scm
+share/gnome/gnucash/scm/prefs.scm
+share/gnome/gnucash/scm/printing/number-to-words.scm
+share/gnome/gnucash/scm/printing/print-check.scm
+share/gnome/gnucash/scm/qif-import/qif-dialog-utils.scm
+share/gnome/gnucash/scm/qif-import/qif-file.scm
+share/gnome/gnucash/scm/qif-import/qif-guess-map.scm
+share/gnome/gnucash/scm/qif-import/qif-import.scm
+share/gnome/gnucash/scm/qif-import/qif-objects.scm
+share/gnome/gnucash/scm/qif-import/qif-parse.scm
+share/gnome/gnucash/scm/qif-import/qif-to-gnc.scm
+share/gnome/gnucash/scm/qif-import/qif-utils.scm
+share/gnome/gnucash/scm/qif-import/simple-obj.scm
+share/gnome/gnucash/scm/report-utilities.scm
+share/gnome/gnucash/scm/report.scm
+share/gnome/gnucash/scm/report/average-balance.scm
+share/gnome/gnucash/scm/report/balance-and-pnl.scm
+share/gnome/gnucash/scm/report/budget-report.scm
+share/gnome/gnucash/scm/report/folio.scm
+share/gnome/gnucash/scm/report/hello-world.scm
+share/gnome/gnucash/scm/report/report-list.scm
+share/gnome/gnucash/scm/report/transaction-report.scm
+share/gnome/gnucash/scm/slib-backup.scm
+share/gnome/gnucash/scm/srfi/srfi-1.r5rs.scm
+share/gnome/gnucash/scm/srfi/srfi-1.unclear.scm
+share/gnome/gnucash/scm/srfi/srfi-19.scm
+share/gnome/gnucash/scm/srfi/srfi-8.guile.scm
+share/gnome/gnucash/scm/srfi/srfi-8.scm
+share/gnome/gnucash/scm/startup.scm
+share/gnome/gnucash/scm/structure.scm
+share/gnome/gnucash/scm/substring-search.scm
+share/gnome/gnucash/scm/testbed.scm
+share/gnome/gnucash/scm/text-export.scm
+share/gnome/gnucash/scm/utilities.scm
+share/gnome/gnucash/scm/xml-generator.scm
share/locale/de/LC_MESSAGES/gnucash.mo
share/locale/en_GB/LC_MESSAGES/gnucash.mo
share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -239,18 +239,18 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
@dirrm etc/gnucash
@dirrm lib/gnucash/perl
@dirrm lib/gnucash
-@dirrm share/gnucash/doc/examples
-@dirrm share/gnucash/doc
-@dirrm share/gnucash/html/C/image
-@dirrm share/gnucash/html/C
-@dirrm share/gnucash/html/fr/image
-@dirrm share/gnucash/html/fr
-@dirrm share/gnucash/html
-@dirrm share/gnucash/perl
-@dirrm share/gnucash/scm/gnumeric
-@dirrm share/gnucash/scm/printing
-@dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/srfi
-@dirrm share/gnucash/scm/report
-@dirrm share/gnucash/scm
-@dirrm share/gnucash
+@dirrm share/gnome/gnucash/doc/examples
+@dirrm share/gnome/gnucash/doc
+@dirrm share/gnome/gnucash/html/C/image
+@dirrm share/gnome/gnucash/html/C
+@dirrm share/gnome/gnucash/html/fr/image
+@dirrm share/gnome/gnucash/html/fr
+@dirrm share/gnome/gnucash/html
+@dirrm share/gnome/gnucash/perl
+@dirrm share/gnome/gnucash/scm/gnumeric
+@dirrm share/gnome/gnucash/scm/printing
+@dirrm share/gnome/gnucash/scm/qif-import
+@dirrm share/gnome/gnucash/scm/srfi
+@dirrm share/gnome/gnucash/scm/report
+@dirrm share/gnome/gnucash/scm
+@dirrm share/gnome/gnucash
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 9f69b20d6a7e..ef1f3fa38ea4 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -19,30 +19,34 @@ MAINTAINER= ade@FreeBSD.org
BUILD_DEPENDS= swig:${PORTSDIR}/devel/SWIG \
g-wrap:${PORTSDIR}/devel/g-wrap \
eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- guile.9:${PORTSDIR}/lang/guile
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
RUN_DEPENDS= slib48:${PORTSDIR}/lang/slib \
gnuplot:${PORTSDIR}/math/gnuplot \
${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww
site_perl= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+USE_X_PREFIX= yes
USE_GMAKE= yes
USE_XPM= yes
-USE_X_PREFIX= yes
USE_PERL5= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-CONFIGURE_ENV= MAKE=gmake \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}"
CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
MAN1= gnc-prices.1 gnucash.1
+pre-patch:
+ @${PERL} -pi -e 's^-l(pthread|c_r)^-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^\$\{datadir\}/aclocal^\$\(prefix\)/share/aclocal^g ; \
+ s^\$\{datadir\}/locale^\$\(prefix\)/share/locale^g'
post-install:
@strip ${PREFIX}/bin/gnucash
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index af03769fe596..bf9f7520019b 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -11,223 +11,223 @@ lib/gnucash/perl/libgncswig.so.1
@exec /sbin/ldconfig -m %D/lib/gnucash
@unexec /sbin/ldconfig -R
share/gnome/apps/Applications/gnucash.desktop
-share/gnucash/doc/AUTHORS
-share/gnucash/doc/COPYING
-share/gnucash/doc/ChangeLog
-share/gnucash/doc/INSTALL
-share/gnucash/doc/NEWS
-share/gnucash/doc/README
-share/gnucash/doc/README.francais
-share/gnucash/doc/README.german
-share/gnucash/doc/examples/Money95bank_fr.qif
-share/gnucash/doc/examples/Money95invst_fr.qif
-share/gnucash/doc/examples/Money95mfunds_fr.qif
-share/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnucash/doc/examples/README
-share/gnucash/doc/examples/abc-all.qif
-share/gnucash/doc/examples/abc.qif
-share/gnucash/doc/examples/bogus.qif
-share/gnucash/doc/examples/cbb-export.qif
-share/gnucash/doc/examples/currency.xac
-share/gnucash/doc/examples/every.qif
-share/gnucash/doc/examples/ms-money.qif
-share/gnucash/doc/examples/quicktest.qif
-share/gnucash/doc/examples/splitdemo.xac
-share/gnucash/doc/examples/swipe.qif
-share/gnucash/doc/examples/test.xac
-share/gnucash/doc/examples/test2.xac
-share/gnucash/doc/examples/test3.xac
-share/gnucash/doc/examples/test4.xac
-share/gnucash/doc/examples/trading.xac
-share/gnucash/doc/examples/trading2.xac
-share/gnucash/doc/examples/web.qif
-share/gnucash/doc/examples/xfer.xac
-share/gnucash/doc/gnc.html
-share/gnucash/doc/guile-hackers.txt
-share/gnucash/html/C/RAW-NOTES
-share/gnucash/html/C/bofa-mym.html
-share/gnucash/html/C/image/appr-asset1.gif
-share/gnucash/html/C/image/appr-asset2.gif
-share/gnucash/html/C/image/appr-income.gif
-share/gnucash/html/C/image/appr-main1.gif
-share/gnucash/html/C/image/appr-main2.gif
-share/gnucash/html/C/image/bal-graph.gif
-share/gnucash/html/C/image/contract.gif
-share/gnucash/html/C/image/depr-asset.gif
-share/gnucash/html/C/image/depr-main.gif
-share/gnucash/html/C/image/expand.gif
-share/gnucash/html/C/image/foliowin-single.gif
-share/gnucash/html/C/image/foliowin.gif
-share/gnucash/html/C/image/logo-NetBSD-banner.gif
-share/gnucash/html/C/image/logo-bullogogross.gif
-share/gnucash/html/C/image/logo-debian.jpg
-share/gnucash/html/C/image/logo-ibm.gif
-share/gnucash/html/C/image/logo-linux.gif
-share/gnucash/html/C/image/logo-sgi.gif
-share/gnucash/html/C/image/logo-skunkware.gif
-share/gnucash/html/C/image/newaccwin-code.gif
-share/gnucash/html/C/image/newaccwin-trade.gif
-share/gnucash/html/C/image/recnwin.gif
-share/gnucash/html/C/image/regwin-double.gif
-share/gnucash/html/C/image/regwin-multi.gif
-share/gnucash/html/C/image/regwin-single.gif
-share/gnucash/html/C/image/regwin-single2.gif
-share/gnucash/html/C/image/report-av-baln.gif
-share/gnucash/html/C/image/report-baln.gif
-share/gnucash/html/C/image/report-folio.gif
-share/gnucash/html/C/image/report-option.gif
-share/gnucash/html/C/image/report-pnl.gif
-share/gnucash/html/C/image/reportwin.gif
-share/gnucash/html/C/image/ticker-a.gif
-share/gnucash/html/C/image/ticker-b.gif
-share/gnucash/html/C/projects.html
-share/gnucash/html/C/xacc-about.html
-share/gnucash/html/C/xacc-accountedit.html
-share/gnucash/html/C/xacc-acctypes.html
-share/gnucash/html/C/xacc-accwin.html
-share/gnucash/html/C/xacc-adjbwin.html
-share/gnucash/html/C/xacc-apar.html
-share/gnucash/html/C/xacc-apprdepr.html
-share/gnucash/html/C/xacc-bal_tracker.html
-share/gnucash/html/C/xacc-balsheet.html
-share/gnucash/html/C/xacc-currency.html
-share/gnucash/html/C/xacc-date.html
-share/gnucash/html/C/xacc-double.html
-share/gnucash/html/C/xacc-euro.html
-share/gnucash/html/C/xacc-expense.html
-share/gnucash/html/C/xacc-find-transactions.html
-share/gnucash/html/C/xacc-globalprefs.html
-share/gnucash/html/C/xacc-globalprops.html
-share/gnucash/html/C/xacc-gpl.html
-share/gnucash/html/C/xacc-groups.html
-share/gnucash/html/C/xacc-main.html
-share/gnucash/html/C/xacc-mainwin.html
-share/gnucash/html/C/xacc-pnl.html
-share/gnucash/html/C/xacc-portfolio_report.html
-share/gnucash/html/C/xacc-print.html
-share/gnucash/html/C/xacc-qif-import.html
-share/gnucash/html/C/xacc-quicken.html
-share/gnucash/html/C/xacc-recnwin.html
-share/gnucash/html/C/xacc-regwin.html
-share/gnucash/html/C/xacc-regwin_kbd.html
-share/gnucash/html/C/xacc-reports.html
-share/gnucash/html/C/xacc-ticker.html
-share/gnucash/html/C/xacc-trans_report.html
-share/gnucash/html/C/xacc-y2k.html
-share/gnucash/html/fr/bofa-mym.html
-share/gnucash/html/fr/image/appr-asset1.gif
-share/gnucash/html/fr/image/appr-asset2.gif
-share/gnucash/html/fr/image/appr-income.gif
-share/gnucash/html/fr/image/appr-main1.gif
-share/gnucash/html/fr/image/appr-main2.gif
-share/gnucash/html/fr/image/contract.gif
-share/gnucash/html/fr/image/depr-asset.gif
-share/gnucash/html/fr/image/depr-main.gif
-share/gnucash/html/fr/image/expand.gif
-share/gnucash/html/fr/image/foliowin-single.gif
-share/gnucash/html/fr/image/foliowin.gif
-share/gnucash/html/fr/image/newaccwin-code.gif
-share/gnucash/html/fr/image/newaccwin-trade.gif
-share/gnucash/html/fr/image/newaccwin.gif
-share/gnucash/html/fr/image/recnwin.gif
-share/gnucash/html/fr/image/regwin-double.gif
-share/gnucash/html/fr/image/regwin-multi.gif
-share/gnucash/html/fr/image/regwin-single.gif
-share/gnucash/html/fr/image/regwin-single2.gif
-share/gnucash/html/fr/image/regwin.gif
-share/gnucash/html/fr/image/report-baln.gif
-share/gnucash/html/fr/image/report-folio.gif
-share/gnucash/html/fr/image/report-option.gif
-share/gnucash/html/fr/image/reportwin.gif
-share/gnucash/html/fr/image/ticker-a.gif
-share/gnucash/html/fr/image/ticker-b.gif
-share/gnucash/html/fr/projects.html
-share/gnucash/html/fr/xacc-about.html
-share/gnucash/html/fr/xacc-accountedit.html
-share/gnucash/html/fr/xacc-acctypes.html
-share/gnucash/html/fr/xacc-accwin.html
-share/gnucash/html/fr/xacc-adjbwin.html
-share/gnucash/html/fr/xacc-apar.html
-share/gnucash/html/fr/xacc-apprdepr.html
-share/gnucash/html/fr/xacc-bal_tracker.html
-share/gnucash/html/fr/xacc-balsheet.html
-share/gnucash/html/fr/xacc-currency.html
-share/gnucash/html/fr/xacc-date.html
-share/gnucash/html/fr/xacc-double.html
-share/gnucash/html/fr/xacc-expense.html
-share/gnucash/html/fr/xacc-globalprefs.html
-share/gnucash/html/fr/xacc-gpl-fr.html
-share/gnucash/html/fr/xacc-gpl.html
-share/gnucash/html/fr/xacc-groups.html
-share/gnucash/html/fr/xacc-main.html
-share/gnucash/html/fr/xacc-mainwin.html
-share/gnucash/html/fr/xacc-pnl.html
-share/gnucash/html/fr/xacc-print.html
-share/gnucash/html/fr/xacc-quicken.html
-share/gnucash/html/fr/xacc-recnwin.html
-share/gnucash/html/fr/xacc-regwin.html
-share/gnucash/html/fr/xacc-reports.html
-share/gnucash/html/fr/xacc-ticker.html
-share/gnucash/html/fr/xacc-trans_report.html
-share/gnucash/html/fr/xacc-y2k.html
-share/gnucash/html/gnucash.css
-share/gnucash/html/index.html
-share/gnucash/perl/Quote.pm
-share/gnucash/perl/gnucash.pm
-share/gnucash/scm/bootstrap.scm
-share/gnucash/scm/bs-interp.scm
-share/gnucash/scm/c-interface.scm
-share/gnucash/scm/command-line.scm
-share/gnucash/scm/config-var.scm
-share/gnucash/scm/currencies.scm
-share/gnucash/scm/date-utilities.scm
-share/gnucash/scm/depend.scm
-share/gnucash/scm/doc.scm
-share/gnucash/scm/engine-interface.scm
-share/gnucash/scm/engine-utilities.scm
-share/gnucash/scm/extensions.scm
-share/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnucash/scm/gnumeric/table-utils.scm
-share/gnucash/scm/graph.scm
-share/gnucash/scm/hooks.scm
-share/gnucash/scm/html-generator.scm
-share/gnucash/scm/main.scm
-share/gnucash/scm/options.scm
-share/gnucash/scm/path.scm
-share/gnucash/scm/prefs.scm
-share/gnucash/scm/printing/number-to-words.scm
-share/gnucash/scm/printing/print-check.scm
-share/gnucash/scm/qif-import/qif-dialog-utils.scm
-share/gnucash/scm/qif-import/qif-file.scm
-share/gnucash/scm/qif-import/qif-guess-map.scm
-share/gnucash/scm/qif-import/qif-import.scm
-share/gnucash/scm/qif-import/qif-objects.scm
-share/gnucash/scm/qif-import/qif-parse.scm
-share/gnucash/scm/qif-import/qif-to-gnc.scm
-share/gnucash/scm/qif-import/qif-utils.scm
-share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/report-utilities.scm
-share/gnucash/scm/report.scm
-share/gnucash/scm/report/average-balance.scm
-share/gnucash/scm/report/balance-and-pnl.scm
-share/gnucash/scm/report/budget-report.scm
-share/gnucash/scm/report/folio.scm
-share/gnucash/scm/report/hello-world.scm
-share/gnucash/scm/report/report-list.scm
-share/gnucash/scm/report/transaction-report.scm
-share/gnucash/scm/slib-backup.scm
-share/gnucash/scm/srfi/srfi-1.r5rs.scm
-share/gnucash/scm/srfi/srfi-1.unclear.scm
-share/gnucash/scm/srfi/srfi-19.scm
-share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/srfi/srfi-8.scm
-share/gnucash/scm/startup.scm
-share/gnucash/scm/structure.scm
-share/gnucash/scm/substring-search.scm
-share/gnucash/scm/testbed.scm
-share/gnucash/scm/text-export.scm
-share/gnucash/scm/utilities.scm
-share/gnucash/scm/xml-generator.scm
+share/gnome/gnucash/doc/AUTHORS
+share/gnome/gnucash/doc/COPYING
+share/gnome/gnucash/doc/ChangeLog
+share/gnome/gnucash/doc/INSTALL
+share/gnome/gnucash/doc/NEWS
+share/gnome/gnucash/doc/README
+share/gnome/gnucash/doc/README.francais
+share/gnome/gnucash/doc/README.german
+share/gnome/gnucash/doc/examples/Money95bank_fr.qif
+share/gnome/gnucash/doc/examples/Money95invst_fr.qif
+share/gnome/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnome/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnome/gnucash/doc/examples/README
+share/gnome/gnucash/doc/examples/abc-all.qif
+share/gnome/gnucash/doc/examples/abc.qif
+share/gnome/gnucash/doc/examples/bogus.qif
+share/gnome/gnucash/doc/examples/cbb-export.qif
+share/gnome/gnucash/doc/examples/currency.xac
+share/gnome/gnucash/doc/examples/every.qif
+share/gnome/gnucash/doc/examples/ms-money.qif
+share/gnome/gnucash/doc/examples/quicktest.qif
+share/gnome/gnucash/doc/examples/splitdemo.xac
+share/gnome/gnucash/doc/examples/swipe.qif
+share/gnome/gnucash/doc/examples/test.xac
+share/gnome/gnucash/doc/examples/test2.xac
+share/gnome/gnucash/doc/examples/test3.xac
+share/gnome/gnucash/doc/examples/test4.xac
+share/gnome/gnucash/doc/examples/trading.xac
+share/gnome/gnucash/doc/examples/trading2.xac
+share/gnome/gnucash/doc/examples/web.qif
+share/gnome/gnucash/doc/examples/xfer.xac
+share/gnome/gnucash/doc/gnc.html
+share/gnome/gnucash/doc/guile-hackers.txt
+share/gnome/gnucash/html/C/RAW-NOTES
+share/gnome/gnucash/html/C/bofa-mym.html
+share/gnome/gnucash/html/C/image/appr-asset1.gif
+share/gnome/gnucash/html/C/image/appr-asset2.gif
+share/gnome/gnucash/html/C/image/appr-income.gif
+share/gnome/gnucash/html/C/image/appr-main1.gif
+share/gnome/gnucash/html/C/image/appr-main2.gif
+share/gnome/gnucash/html/C/image/bal-graph.gif
+share/gnome/gnucash/html/C/image/contract.gif
+share/gnome/gnucash/html/C/image/depr-asset.gif
+share/gnome/gnucash/html/C/image/depr-main.gif
+share/gnome/gnucash/html/C/image/expand.gif
+share/gnome/gnucash/html/C/image/foliowin-single.gif
+share/gnome/gnucash/html/C/image/foliowin.gif
+share/gnome/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnome/gnucash/html/C/image/logo-bullogogross.gif
+share/gnome/gnucash/html/C/image/logo-debian.jpg
+share/gnome/gnucash/html/C/image/logo-ibm.gif
+share/gnome/gnucash/html/C/image/logo-linux.gif
+share/gnome/gnucash/html/C/image/logo-sgi.gif
+share/gnome/gnucash/html/C/image/logo-skunkware.gif
+share/gnome/gnucash/html/C/image/newaccwin-code.gif
+share/gnome/gnucash/html/C/image/newaccwin-trade.gif
+share/gnome/gnucash/html/C/image/recnwin.gif
+share/gnome/gnucash/html/C/image/regwin-double.gif
+share/gnome/gnucash/html/C/image/regwin-multi.gif
+share/gnome/gnucash/html/C/image/regwin-single.gif
+share/gnome/gnucash/html/C/image/regwin-single2.gif
+share/gnome/gnucash/html/C/image/report-av-baln.gif
+share/gnome/gnucash/html/C/image/report-baln.gif
+share/gnome/gnucash/html/C/image/report-folio.gif
+share/gnome/gnucash/html/C/image/report-option.gif
+share/gnome/gnucash/html/C/image/report-pnl.gif
+share/gnome/gnucash/html/C/image/reportwin.gif
+share/gnome/gnucash/html/C/image/ticker-a.gif
+share/gnome/gnucash/html/C/image/ticker-b.gif
+share/gnome/gnucash/html/C/projects.html
+share/gnome/gnucash/html/C/xacc-about.html
+share/gnome/gnucash/html/C/xacc-accountedit.html
+share/gnome/gnucash/html/C/xacc-acctypes.html
+share/gnome/gnucash/html/C/xacc-accwin.html
+share/gnome/gnucash/html/C/xacc-adjbwin.html
+share/gnome/gnucash/html/C/xacc-apar.html
+share/gnome/gnucash/html/C/xacc-apprdepr.html
+share/gnome/gnucash/html/C/xacc-bal_tracker.html
+share/gnome/gnucash/html/C/xacc-balsheet.html
+share/gnome/gnucash/html/C/xacc-currency.html
+share/gnome/gnucash/html/C/xacc-date.html
+share/gnome/gnucash/html/C/xacc-double.html
+share/gnome/gnucash/html/C/xacc-euro.html
+share/gnome/gnucash/html/C/xacc-expense.html
+share/gnome/gnucash/html/C/xacc-find-transactions.html
+share/gnome/gnucash/html/C/xacc-globalprefs.html
+share/gnome/gnucash/html/C/xacc-globalprops.html
+share/gnome/gnucash/html/C/xacc-gpl.html
+share/gnome/gnucash/html/C/xacc-groups.html
+share/gnome/gnucash/html/C/xacc-main.html
+share/gnome/gnucash/html/C/xacc-mainwin.html
+share/gnome/gnucash/html/C/xacc-pnl.html
+share/gnome/gnucash/html/C/xacc-portfolio_report.html
+share/gnome/gnucash/html/C/xacc-print.html
+share/gnome/gnucash/html/C/xacc-qif-import.html
+share/gnome/gnucash/html/C/xacc-quicken.html
+share/gnome/gnucash/html/C/xacc-recnwin.html
+share/gnome/gnucash/html/C/xacc-regwin.html
+share/gnome/gnucash/html/C/xacc-regwin_kbd.html
+share/gnome/gnucash/html/C/xacc-reports.html
+share/gnome/gnucash/html/C/xacc-ticker.html
+share/gnome/gnucash/html/C/xacc-trans_report.html
+share/gnome/gnucash/html/C/xacc-y2k.html
+share/gnome/gnucash/html/fr/bofa-mym.html
+share/gnome/gnucash/html/fr/image/appr-asset1.gif
+share/gnome/gnucash/html/fr/image/appr-asset2.gif
+share/gnome/gnucash/html/fr/image/appr-income.gif
+share/gnome/gnucash/html/fr/image/appr-main1.gif
+share/gnome/gnucash/html/fr/image/appr-main2.gif
+share/gnome/gnucash/html/fr/image/contract.gif
+share/gnome/gnucash/html/fr/image/depr-asset.gif
+share/gnome/gnucash/html/fr/image/depr-main.gif
+share/gnome/gnucash/html/fr/image/expand.gif
+share/gnome/gnucash/html/fr/image/foliowin-single.gif
+share/gnome/gnucash/html/fr/image/foliowin.gif
+share/gnome/gnucash/html/fr/image/newaccwin-code.gif
+share/gnome/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnome/gnucash/html/fr/image/newaccwin.gif
+share/gnome/gnucash/html/fr/image/recnwin.gif
+share/gnome/gnucash/html/fr/image/regwin-double.gif
+share/gnome/gnucash/html/fr/image/regwin-multi.gif
+share/gnome/gnucash/html/fr/image/regwin-single.gif
+share/gnome/gnucash/html/fr/image/regwin-single2.gif
+share/gnome/gnucash/html/fr/image/regwin.gif
+share/gnome/gnucash/html/fr/image/report-baln.gif
+share/gnome/gnucash/html/fr/image/report-folio.gif
+share/gnome/gnucash/html/fr/image/report-option.gif
+share/gnome/gnucash/html/fr/image/reportwin.gif
+share/gnome/gnucash/html/fr/image/ticker-a.gif
+share/gnome/gnucash/html/fr/image/ticker-b.gif
+share/gnome/gnucash/html/fr/projects.html
+share/gnome/gnucash/html/fr/xacc-about.html
+share/gnome/gnucash/html/fr/xacc-accountedit.html
+share/gnome/gnucash/html/fr/xacc-acctypes.html
+share/gnome/gnucash/html/fr/xacc-accwin.html
+share/gnome/gnucash/html/fr/xacc-adjbwin.html
+share/gnome/gnucash/html/fr/xacc-apar.html
+share/gnome/gnucash/html/fr/xacc-apprdepr.html
+share/gnome/gnucash/html/fr/xacc-bal_tracker.html
+share/gnome/gnucash/html/fr/xacc-balsheet.html
+share/gnome/gnucash/html/fr/xacc-currency.html
+share/gnome/gnucash/html/fr/xacc-date.html
+share/gnome/gnucash/html/fr/xacc-double.html
+share/gnome/gnucash/html/fr/xacc-expense.html
+share/gnome/gnucash/html/fr/xacc-globalprefs.html
+share/gnome/gnucash/html/fr/xacc-gpl-fr.html
+share/gnome/gnucash/html/fr/xacc-gpl.html
+share/gnome/gnucash/html/fr/xacc-groups.html
+share/gnome/gnucash/html/fr/xacc-main.html
+share/gnome/gnucash/html/fr/xacc-mainwin.html
+share/gnome/gnucash/html/fr/xacc-pnl.html
+share/gnome/gnucash/html/fr/xacc-print.html
+share/gnome/gnucash/html/fr/xacc-quicken.html
+share/gnome/gnucash/html/fr/xacc-recnwin.html
+share/gnome/gnucash/html/fr/xacc-regwin.html
+share/gnome/gnucash/html/fr/xacc-reports.html
+share/gnome/gnucash/html/fr/xacc-ticker.html
+share/gnome/gnucash/html/fr/xacc-trans_report.html
+share/gnome/gnucash/html/fr/xacc-y2k.html
+share/gnome/gnucash/html/gnucash.css
+share/gnome/gnucash/html/index.html
+share/gnome/gnucash/perl/Quote.pm
+share/gnome/gnucash/perl/gnucash.pm
+share/gnome/gnucash/scm/bootstrap.scm
+share/gnome/gnucash/scm/bs-interp.scm
+share/gnome/gnucash/scm/c-interface.scm
+share/gnome/gnucash/scm/command-line.scm
+share/gnome/gnucash/scm/config-var.scm
+share/gnome/gnucash/scm/currencies.scm
+share/gnome/gnucash/scm/date-utilities.scm
+share/gnome/gnucash/scm/depend.scm
+share/gnome/gnucash/scm/doc.scm
+share/gnome/gnucash/scm/engine-interface.scm
+share/gnome/gnucash/scm/engine-utilities.scm
+share/gnome/gnucash/scm/extensions.scm
+share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm
+share/gnome/gnucash/scm/gnumeric/table-utils.scm
+share/gnome/gnucash/scm/graph.scm
+share/gnome/gnucash/scm/hooks.scm
+share/gnome/gnucash/scm/html-generator.scm
+share/gnome/gnucash/scm/main.scm
+share/gnome/gnucash/scm/options.scm
+share/gnome/gnucash/scm/path.scm
+share/gnome/gnucash/scm/prefs.scm
+share/gnome/gnucash/scm/printing/number-to-words.scm
+share/gnome/gnucash/scm/printing/print-check.scm
+share/gnome/gnucash/scm/qif-import/qif-dialog-utils.scm
+share/gnome/gnucash/scm/qif-import/qif-file.scm
+share/gnome/gnucash/scm/qif-import/qif-guess-map.scm
+share/gnome/gnucash/scm/qif-import/qif-import.scm
+share/gnome/gnucash/scm/qif-import/qif-objects.scm
+share/gnome/gnucash/scm/qif-import/qif-parse.scm
+share/gnome/gnucash/scm/qif-import/qif-to-gnc.scm
+share/gnome/gnucash/scm/qif-import/qif-utils.scm
+share/gnome/gnucash/scm/qif-import/simple-obj.scm
+share/gnome/gnucash/scm/report-utilities.scm
+share/gnome/gnucash/scm/report.scm
+share/gnome/gnucash/scm/report/average-balance.scm
+share/gnome/gnucash/scm/report/balance-and-pnl.scm
+share/gnome/gnucash/scm/report/budget-report.scm
+share/gnome/gnucash/scm/report/folio.scm
+share/gnome/gnucash/scm/report/hello-world.scm
+share/gnome/gnucash/scm/report/report-list.scm
+share/gnome/gnucash/scm/report/transaction-report.scm
+share/gnome/gnucash/scm/slib-backup.scm
+share/gnome/gnucash/scm/srfi/srfi-1.r5rs.scm
+share/gnome/gnucash/scm/srfi/srfi-1.unclear.scm
+share/gnome/gnucash/scm/srfi/srfi-19.scm
+share/gnome/gnucash/scm/srfi/srfi-8.guile.scm
+share/gnome/gnucash/scm/srfi/srfi-8.scm
+share/gnome/gnucash/scm/startup.scm
+share/gnome/gnucash/scm/structure.scm
+share/gnome/gnucash/scm/substring-search.scm
+share/gnome/gnucash/scm/testbed.scm
+share/gnome/gnucash/scm/text-export.scm
+share/gnome/gnucash/scm/utilities.scm
+share/gnome/gnucash/scm/xml-generator.scm
share/locale/de/LC_MESSAGES/gnucash.mo
share/locale/en_GB/LC_MESSAGES/gnucash.mo
share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -239,18 +239,18 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
@dirrm etc/gnucash
@dirrm lib/gnucash/perl
@dirrm lib/gnucash
-@dirrm share/gnucash/doc/examples
-@dirrm share/gnucash/doc
-@dirrm share/gnucash/html/C/image
-@dirrm share/gnucash/html/C
-@dirrm share/gnucash/html/fr/image
-@dirrm share/gnucash/html/fr
-@dirrm share/gnucash/html
-@dirrm share/gnucash/perl
-@dirrm share/gnucash/scm/gnumeric
-@dirrm share/gnucash/scm/printing
-@dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/srfi
-@dirrm share/gnucash/scm/report
-@dirrm share/gnucash/scm
-@dirrm share/gnucash
+@dirrm share/gnome/gnucash/doc/examples
+@dirrm share/gnome/gnucash/doc
+@dirrm share/gnome/gnucash/html/C/image
+@dirrm share/gnome/gnucash/html/C
+@dirrm share/gnome/gnucash/html/fr/image
+@dirrm share/gnome/gnucash/html/fr
+@dirrm share/gnome/gnucash/html
+@dirrm share/gnome/gnucash/perl
+@dirrm share/gnome/gnucash/scm/gnumeric
+@dirrm share/gnome/gnucash/scm/printing
+@dirrm share/gnome/gnucash/scm/qif-import
+@dirrm share/gnome/gnucash/scm/srfi
+@dirrm share/gnome/gnucash/scm/report
+@dirrm share/gnome/gnucash/scm
+@dirrm share/gnome/gnucash
diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile
index 5af05a4535c9..c1107396ee77 100644
--- a/ftp/gtm/Makefile
+++ b/ftp/gtm/Makefile
@@ -13,22 +13,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
- panel_applet.4:${PORTSDIR}/x11/gnomecore
BUILD_DEPENDS= wget:${PORTSDIR}/ftp/wget
-RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget \
- gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index 5d2e8a2dccaf..1107d55f0bec 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -13,21 +13,16 @@ DISTNAME= jm-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- gnet.0:${PORTSDIR}/net/gnet \
+LIB_DEPENDS= gnet.0:${PORTSDIR}/net/gnet \
popt.0:${PORTSDIR}/devel/popt \
glade.4:${PORTSDIR}/devel/libglade
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --enable-gnome
+CONFIGURE_ARGS= --enable-gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= jm.1 jmlite.1 jmsearchserver.1 mtprendezvous.1
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 4cf79921416b..4466990e6d2a 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -13,17 +13,10 @@ DISTNAME= atomix-0.2.0-1
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index 96210876bd67..ecbb88126bd0 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -13,26 +13,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -fpermissive
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 370ee96880db..a6d5bbb2fdfb 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -15,29 +15,23 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
post-extract:
@${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
@${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
- @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
- 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \
- s|\$\(datadir\)/sounds|\$\(datadir\)/gnome/sounds|g ; \
- s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g'
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+ s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist
index e9a93f247271..de80d4173a65 100644
--- a/games/gcompris/pkg-plist
+++ b/games/gcompris/pkg-plist
@@ -1,16 +1,16 @@
bin/gcompris
etc/sound/events/gcompris.soundlist
-share/gcompris/data/wordsgame/wordslevel1.en
-share/gcompris/data/wordsgame/wordslevel1.es
-share/gcompris/data/wordsgame/wordslevel1.fr
-share/gcompris/data/wordsgame/wordslevel2.en
-share/gcompris/data/wordsgame/wordslevel2.es
-share/gcompris/data/wordsgame/wordslevel2.fr
-share/gcompris/data/wordsgame/wordslevelmax.en
-share/gcompris/data/wordsgame/wordslevelmax.es
-share/gcompris/data/wordsgame/wordslevelmax.fr
-share/gcompris/data/wordsgame/wordslevelmax.nl
share/gnome/apps/Games/gcompris.desktop
+share/gnome/gcompris/data/wordsgame/wordslevel1.en
+share/gnome/gcompris/data/wordsgame/wordslevel1.es
+share/gnome/gcompris/data/wordsgame/wordslevel1.fr
+share/gnome/gcompris/data/wordsgame/wordslevel2.en
+share/gnome/gcompris/data/wordsgame/wordslevel2.es
+share/gnome/gcompris/data/wordsgame/wordslevel2.fr
+share/gnome/gcompris/data/wordsgame/wordslevelmax.en
+share/gnome/gcompris/data/wordsgame/wordslevelmax.es
+share/gnome/gcompris/data/wordsgame/wordslevelmax.fr
+share/gnome/gcompris/data/wordsgame/wordslevelmax.nl
share/gnome/pixmaps/gcompris/animals/baby-elephant.png
share/gnome/pixmaps/gcompris/animals/baby-gorilla.png
share/gnome/pixmaps/gcompris/animals/bat.png
@@ -156,6 +156,6 @@ share/locale/nl/LC_MESSAGES/gcompris.mo
@dirrm share/gnome/pixmaps/gcompris/buttons
@dirrm share/gnome/pixmaps/gcompris/animals
@dirrm share/gnome/pixmaps/gcompris
-@dirrm share/gcompris/data/wordsgame
-@dirrm share/gcompris/data
-@dirrm share/gcompris
+@dirrm share/gnome/gcompris/data/wordsgame
+@dirrm share/gnome/gcompris/data
+@dirrm share/gnome/gcompris
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 370ee96880db..a6d5bbb2fdfb 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -15,29 +15,23 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
post-extract:
@${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
@${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
- @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
- 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \
- s|\$\(datadir\)/sounds|\$\(datadir\)/gnome/sounds|g ; \
- s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g'
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+ s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index e9a93f247271..de80d4173a65 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -1,16 +1,16 @@
bin/gcompris
etc/sound/events/gcompris.soundlist
-share/gcompris/data/wordsgame/wordslevel1.en
-share/gcompris/data/wordsgame/wordslevel1.es
-share/gcompris/data/wordsgame/wordslevel1.fr
-share/gcompris/data/wordsgame/wordslevel2.en
-share/gcompris/data/wordsgame/wordslevel2.es
-share/gcompris/data/wordsgame/wordslevel2.fr
-share/gcompris/data/wordsgame/wordslevelmax.en
-share/gcompris/data/wordsgame/wordslevelmax.es
-share/gcompris/data/wordsgame/wordslevelmax.fr
-share/gcompris/data/wordsgame/wordslevelmax.nl
share/gnome/apps/Games/gcompris.desktop
+share/gnome/gcompris/data/wordsgame/wordslevel1.en
+share/gnome/gcompris/data/wordsgame/wordslevel1.es
+share/gnome/gcompris/data/wordsgame/wordslevel1.fr
+share/gnome/gcompris/data/wordsgame/wordslevel2.en
+share/gnome/gcompris/data/wordsgame/wordslevel2.es
+share/gnome/gcompris/data/wordsgame/wordslevel2.fr
+share/gnome/gcompris/data/wordsgame/wordslevelmax.en
+share/gnome/gcompris/data/wordsgame/wordslevelmax.es
+share/gnome/gcompris/data/wordsgame/wordslevelmax.fr
+share/gnome/gcompris/data/wordsgame/wordslevelmax.nl
share/gnome/pixmaps/gcompris/animals/baby-elephant.png
share/gnome/pixmaps/gcompris/animals/baby-gorilla.png
share/gnome/pixmaps/gcompris/animals/bat.png
@@ -156,6 +156,6 @@ share/locale/nl/LC_MESSAGES/gcompris.mo
@dirrm share/gnome/pixmaps/gcompris/buttons
@dirrm share/gnome/pixmaps/gcompris/animals
@dirrm share/gnome/pixmaps/gcompris
-@dirrm share/gcompris/data/wordsgame
-@dirrm share/gcompris/data
-@dirrm share/gcompris
+@dirrm share/gnome/gcompris/data/wordsgame
+@dirrm share/gnome/gcompris/data
+@dirrm share/gnome/gcompris
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 7a72dc3ac81d..a40d496f624a 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -13,14 +13,19 @@ EXTRACT_SUFX= .tgz
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GNOME_CONFIG?= ${X11BASE}/bin/gnome-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= GNOME_CONFIG=${GNOME_CONFIG} GTK_CONFIG=${GTK_CONFIG}
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+ @${PERL} -pi -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|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
pre-configure:
@${RM} -f ${WRKSRC}/config.cache
@@ -28,7 +33,7 @@ pre-configure:
post-install:
${CHOWN} root:games ${PREFIX}/bin/gno3dtet
${CHMOD} 2555 ${PREFIX}/bin/gno3dtet
- ${CHOWN} root:games ${PREFIX}/var/games/gno3dtet.hof
- ${CHMOD} 664 ${PREFIX}/var/games/gno3dtet.hof
+ ${CHOWN} root:games ${PREFIX}/share/gnome/games/gno3dtet.hof
+ ${CHMOD} 664 ${PREFIX}/share/gnome/games/gno3dtet.hof
.include <bsd.port.mk>
diff --git a/games/gno3dtet/pkg-plist b/games/gno3dtet/pkg-plist
index a4e088a973ad..0694b7bb88dc 100644
--- a/games/gno3dtet/pkg-plist
+++ b/games/gno3dtet/pkg-plist
@@ -1,21 +1,21 @@
bin/gno3dtet
share/gnome/apps/Games/gno3dtet.desktop
-share/gnome/help/gno3dtet/C/topic.dat
-share/gnome/help/gno3dtet/C/gno3dtet.html
+share/gnome/games/gno3dtet.hof
share/gnome/help/gno3dtet/C/copying.html
-share/pixmaps/gno3dtet.png
-var/games/gno3dtet.hof
-share/sounds/gno3dtet/danger.wav
-share/sounds/gno3dtet/fall.wav
-share/sounds/gno3dtet/hof.wav
-share/sounds/gno3dtet/land.wav
-share/sounds/gno3dtet/layer.wav
-share/sounds/gno3dtet/level.wav
-share/sounds/gno3dtet/move.wav
-share/sounds/gno3dtet/new.wav
-share/sounds/gno3dtet/pause.wav
-share/sounds/gno3dtet/score.wav
-share/sounds/gno3dtet/screwd.wav
+share/gnome/help/gno3dtet/C/gno3dtet.html
+share/gnome/help/gno3dtet/C/topic.dat
+share/gnome/pixmaps/gno3dtet.png
+share/gnome/sounds/gno3dtet/danger.wav
+share/gnome/sounds/gno3dtet/fall.wav
+share/gnome/sounds/gno3dtet/hof.wav
+share/gnome/sounds/gno3dtet/land.wav
+share/gnome/sounds/gno3dtet/layer.wav
+share/gnome/sounds/gno3dtet/level.wav
+share/gnome/sounds/gno3dtet/move.wav
+share/gnome/sounds/gno3dtet/new.wav
+share/gnome/sounds/gno3dtet/pause.wav
+share/gnome/sounds/gno3dtet/score.wav
+share/gnome/sounds/gno3dtet/screwd.wav
+@dirrm share/gnome/sounds/gno3dtet
@dirrm share/gnome/help/gno3dtet/C
@dirrm share/gnome/help/gno3dtet
-@dirrm share/sounds/gno3dtet
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index c71e51672f19..60a0982878cd 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -13,19 +13,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 4ff817e59c07..83b8044bef9c 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -14,20 +14,14 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- guile.9:${PORTSDIR}/lang/guile
-RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 6d7c82228e83..1bf721b63f69 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -14,22 +14,14 @@ DISTNAME= gnome-chess-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
-BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- crafty:${PORTSDIR}/games/crafty
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- crafty:${PORTSDIR}/games/crafty
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty
+RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --with-gnome=${PREFIX}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index 4ff817e59c07..83b8044bef9c 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -14,20 +14,14 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- guile.9:${PORTSDIR}/lang/guile
-RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 4ff817e59c07..83b8044bef9c 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -14,20 +14,14 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- guile.9:${PORTSDIR}/lang/guile
-RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index f7e8ba9bdbe0..e64e95038c57 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -14,21 +14,10 @@ DISTNAME= gnome-memblocks-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
- ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 10108f951eea..5dccc8912ed5 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -12,11 +12,13 @@ MASTER_SITE_SUBDIR= gtetrinet
MAINTAINER= bugg@bugg.strangled.net
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG= "${X11BASE}/bin/gtk12-config"
+USE_X_PREFIX= yes
USE_GMAKE= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+USE_GNOME= yes
GNU_CONFIGURE= yes
+pre-patch:
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g'
+
.include <bsd.port.mk>
diff --git a/games/gtetrinet/pkg-plist b/games/gtetrinet/pkg-plist
index ecafe1e1e841..422a50138895 100644
--- a/games/gtetrinet/pkg-plist
+++ b/games/gtetrinet/pkg-plist
@@ -1,8 +1,8 @@
bin/gtetrinet
-share/gtetrinet/themes/default/blocks.png
-share/gtetrinet/themes/default/theme.cfg
-share/pixmaps/gtetrinet.png
+share/gnome/gtetrinet/themes/default/blocks.png
+share/gnome/gtetrinet/themes/default/theme.cfg
+share/gnome/pixmaps/gtetrinet.png
share/gnome/apps/Games/gtetrinet.desktop
-@dirrm share/gtetrinet/themes/default
-@dirrm share/gtetrinet/themes
-@dirrm share/gtetrinet
+@dirrm share/gnome/gtetrinet/themes/default
+@dirrm share/gnome/gtetrinet/themes
+@dirrm share/gnome/gtetrinet
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 7fc47792dbbb..f21b02e40ebc 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -13,21 +13,11 @@ MASTER_SITES= http://www.dvgu.ru/ifit/~panov/gtktetcolor/ \
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
-
USE_X_PREFIX= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index c71e51672f19..60a0982878cd 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -13,19 +13,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/games/pythoong/Makefile b/games/pythoong/Makefile
index bc4b6086ab90..97488dbad7a8 100644
--- a/games/pythoong/Makefile
+++ b/games/pythoong/Makefile
@@ -13,28 +13,21 @@ MASTER_SITES= http://perso.wanadoo.fr/christophe.cressend/tarballs/
MAINTAINER= sobomax@FreeBSD.org
BUILD_DEPENDS= xbmtopbm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-post-extract:
+pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
- 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \
- s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g'
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index 5901a5c78fc5..c3d6b751cfc5 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -12,17 +12,9 @@ MASTER_SITES= http://www.linuxstart.com/~arjan/diacanvas/download/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
+USE_GNOME= yes
+USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
- LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/graphics/diacanvas/files/patch-ac b/graphics/diacanvas/files/patch-ac
new file mode 100644
index 000000000000..01c47d384a78
--- /dev/null
+++ b/graphics/diacanvas/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Sun Feb 27 15:26:48 2000
++++ Makefile.in Sun Feb 27 15:27:02 2000
+@@ -101,7 +101,7 @@
+ EXTRA_DIST = diacanvas.m4 TODO BUGS
+
+
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
+ m4data_DATA = diacanvas.m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/diacanvas/pkg-plist b/graphics/diacanvas/pkg-plist
index 7279605a1ba7..5dc17d7de293 100644
--- a/graphics/diacanvas/pkg-plist
+++ b/graphics/diacanvas/pkg-plist
@@ -31,8 +31,7 @@ include/diacanvas/diarenderergdk.h
include/diacanvas/diatool.h
include/diacanvas/geometry.h
lib/libdiacanvas.a
-lib/libdiacanvas.la
lib/libdiacanvas.so
lib/libdiacanvas.so.1
-share/gnome/aclocal/diacanvas.m4
+share/aclocal/diacanvas.m4
@dirrm include/diacanvas
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index b26c411e41ae..46b83229e5af 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -14,17 +14,11 @@ DISTNAME= ee-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+USE_GNOME= yes
+USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 54f62f2fcf4c..32df7cad810a 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -14,16 +14,14 @@ MASTER_SITE_SUBDIR= unstable/sources/eog
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.1:${PORTSDIR}/devel/gconf
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 54f62f2fcf4c..32df7cad810a 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -14,16 +14,14 @@ MASTER_SITE_SUBDIR= unstable/sources/eog
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
- glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.1:${PORTSDIR}/devel/gconf
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 90bfdbd3b736..9b8da6463eba 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -13,18 +13,17 @@ MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOMELIBS= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+ s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g'
+
.include <bsd.port.mk>
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac
index eac708432de8..5f4cee332a2a 100644
--- a/graphics/gdk-pixbuf/files/patch-ac
+++ b/graphics/gdk-pixbuf/files/patch-ac
@@ -91,18 +91,18 @@
-@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) -lgmodule
-@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+@INSIDE_GNOME_LIBS_TRUE@test_gdk_pixbuf_LDADD = $(LDADDS) -lgmodule12
-+@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
-+@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) -lgmodule12
-+@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
++@INSIDE_GNOME_LIBS_TRUE@test_gdk_pixbuf_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
@INSIDE_GNOME_LIBS_TRUE@testpixbuf_drawable_LDADD = $(LDADDS)
@INSIDE_GNOME_LIBS_FALSE@testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
@INSIDE_GNOME_LIBS_TRUE@testpixbuf_scale_LDADD = $(LDADDS)
@INSIDE_GNOME_LIBS_FALSE@testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
-@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule
-@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule12
-+@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
++@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index b05780cde348..df340c259227 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -13,15 +13,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
+USE_NEWGCC= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} \
- CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share
-USE_NEWGCC= yes
+
+pre-patch:
+ @${PERL} -pi -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'
.include <bsd.port.mk>
diff --git a/graphics/gnofract4d/pkg-plist b/graphics/gnofract4d/pkg-plist
index 41da483b5d9c..0bbfde6f65de 100644
--- a/graphics/gnofract4d/pkg-plist
+++ b/graphics/gnofract4d/pkg-plist
@@ -86,6 +86,7 @@ share/gnome/pixmaps/gnofract4d/gnofract4d-logo.png
share/locale/fr/LC_MESSAGES/gnofract4d.mo
@dirrm share/gnome/pixmaps/gnofract4d
@dirrm share/gnome/maps/gnofract4d
+@dirrm share/gnome/maps
@dirrm share/gnome/help/gnofract4d/C/images
@dirrm share/gnome/help/gnofract4d/C
@dirrm share/gnome/help/gnofract4d
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index f6a3ffa91402..f64dfc8187b4 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -12,25 +12,16 @@ MASTER_SITES= http://wine.sexcity.pl/morpheus/
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- morph.0:${PORTSDIR}/graphics/libmorph \
+LIB_DEPENDS= morph.0:${PORTSDIR}/graphics/libmorph \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_MESA= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 11856fe2b7a6..3a9a7cd8272a 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -13,21 +13,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
- glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \
gnomeprint.12:${PORTSDIR}/print/gnomeprint \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
bonobo.2:${PORTSDIR}/devel/bonobo
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
diff --git a/graphics/xmps/Makefile b/graphics/xmps/Makefile
index cb70ed2e4d13..44902316fb02 100644
--- a/graphics/xmps/Makefile
+++ b/graphics/xmps/Makefile
@@ -12,22 +12,26 @@ MASTER_SITES= http://www-eleves.enst-bretagne.fr/~chavarri/xmps/sources/
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= smpeg.0:${PORTSDIR}/graphics/smpeg \
- gnome.4:${PORTSDIR}/x11/gnomelibs \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS= smpeg.0:${PORTSDIR}/graphics/smpeg
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-USE_X_PREFIX= yes
-USE_LIBTOOL= yes
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
+USE_X_PREFIX= yes
+USE_GNOME= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
SDL_CONFIG="${SDL_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -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/graphics/xmps/files/patch-aa b/graphics/xmps/files/patch-aa
index 7ae2c2967701..a7d89a3e518e 100644
--- a/graphics/xmps/files/patch-aa
+++ b/graphics/xmps/files/patch-aa
@@ -16,33 +16,6 @@
cat >> confdefs.h <<\EOF
#define AS_STRETCHER 1
EOF
-@@ -2979,14 +2981,14 @@
- { echo "configure: error: *** POSIX thread support not installed ***" 1>&2; exit 1; }
- fi
-
--echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
--echo "configure:2984: checking for pthread_attr_init in -lpthread" >&5
-+echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
-+echo "configure:2984: checking for pthread_attr_init in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lpthread $LIBS"
-+LIBS="-pthread $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2992 "configure"
- #include "confdefs.h"
-@@ -3020,7 +3022,7 @@
- #define $ac_tr_lib 1
- EOF
-
-- LIBS="-lpthread $LIBS"
-+ LIBS="-pthread $LIBS"
-
- else
- echo "$ac_t""no" 1>&6
@@ -4060,16 +4062,16 @@
{ echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
fi
diff --git a/graphics/xmps/pkg-plist b/graphics/xmps/pkg-plist
index a292fff4c220..836cb270fa9d 100644
--- a/graphics/xmps/pkg-plist
+++ b/graphics/xmps/pkg-plist
@@ -3,30 +3,30 @@ lib/xmps/Codecs/libsmpeg.so
lib/xmps/Renderers/libSDL.so
lib/xmps/Renderers/libX11.so
share/gnome/apps/Multimedia/XMPS.desktop
+share/gnome/pixmaps/xmps.png
+share/gnome/xmps/skins/DarkDepth/buttons.xpm
+share/gnome/xmps/skins/DarkDepth/config
+share/gnome/xmps/skins/DarkDepth/controls.xpm
+share/gnome/xmps/skins/DarkDepth/digits.xpm
+share/gnome/xmps/skins/DarkDepth/main.xpm
+share/gnome/xmps/skins/DarkDepth/playlist.xpm
+share/gnome/xmps/skins/DarkDepth/titlebar.xpm
+share/gnome/xmps/skins/default/buttons.xpm
+share/gnome/xmps/skins/default/config
+share/gnome/xmps/skins/default/controls.xpm
+share/gnome/xmps/skins/default/digits.xpm
+share/gnome/xmps/skins/default/main.xpm
+share/gnome/xmps/skins/default/playlist.xpm
+share/gnome/xmps/skins/default/titlebar.xpm
+share/gnome/xmps/xmps_intro.xpm
share/locale/fi/LC_MESSAGES/xmps.mo
share/locale/fr/LC_MESSAGES/xmps.mo
share/locale/pl/LC_MESSAGES/xmps.mo
share/locale/sv/LC_MESSAGES/xmps.mo
-share/gnome/pixmaps/xmps.png
-share/xmps/skins/DarkDepth/buttons.xpm
-share/xmps/skins/DarkDepth/config
-share/xmps/skins/DarkDepth/controls.xpm
-share/xmps/skins/DarkDepth/digits.xpm
-share/xmps/skins/DarkDepth/main.xpm
-share/xmps/skins/DarkDepth/playlist.xpm
-share/xmps/skins/DarkDepth/titlebar.xpm
-share/xmps/skins/default/buttons.xpm
-share/xmps/skins/default/config
-share/xmps/skins/default/controls.xpm
-share/xmps/skins/default/digits.xpm
-share/xmps/skins/default/main.xpm
-share/xmps/skins/default/playlist.xpm
-share/xmps/skins/default/titlebar.xpm
-share/xmps/xmps_intro.xpm
-@dirrm share/xmps/skins/default
-@dirrm share/xmps/skins/DarkDepth
-@dirrm share/xmps/skins
-@dirrm share/xmps
+@dirrm share/gnome/xmps/skins/default
+@dirrm share/gnome/xmps/skins/DarkDepth
+@dirrm share/gnome/xmps/skins
+@dirrm share/gnome/xmps
@dirrm lib/xmps/Renderers
@dirrm lib/xmps/Codecs
@dirrm lib/xmps
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index cb70ed2e4d13..44902316fb02 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -12,22 +12,26 @@ MASTER_SITES= http://www-eleves.enst-bretagne.fr/~chavarri/xmps/sources/
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= smpeg.0:${PORTSDIR}/graphics/smpeg \
- gnome.4:${PORTSDIR}/x11/gnomelibs \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS= smpeg.0:${PORTSDIR}/graphics/smpeg
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-USE_X_PREFIX= yes
-USE_LIBTOOL= yes
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
+USE_X_PREFIX= yes
+USE_GNOME= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
SDL_CONFIG="${SDL_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|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 ${PERL} -pi -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/multimedia/xmps/files/patch-aa b/multimedia/xmps/files/patch-aa
index 7ae2c2967701..a7d89a3e518e 100644
--- a/multimedia/xmps/files/patch-aa
+++ b/multimedia/xmps/files/patch-aa
@@ -16,33 +16,6 @@
cat >> confdefs.h <<\EOF
#define AS_STRETCHER 1
EOF
-@@ -2979,14 +2981,14 @@
- { echo "configure: error: *** POSIX thread support not installed ***" 1>&2; exit 1; }
- fi
-
--echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
--echo "configure:2984: checking for pthread_attr_init in -lpthread" >&5
-+echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
-+echo "configure:2984: checking for pthread_attr_init in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lpthread $LIBS"
-+LIBS="-pthread $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2992 "configure"
- #include "confdefs.h"
-@@ -3020,7 +3022,7 @@
- #define $ac_tr_lib 1
- EOF
-
-- LIBS="-lpthread $LIBS"
-+ LIBS="-pthread $LIBS"
-
- else
- echo "$ac_t""no" 1>&6
@@ -4060,16 +4062,16 @@
{ echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
fi
diff --git a/multimedia/xmps/pkg-plist b/multimedia/xmps/pkg-plist
index a292fff4c220..836cb270fa9d 100644
--- a/multimedia/xmps/pkg-plist
+++ b/multimedia/xmps/pkg-plist
@@ -3,30 +3,30 @@ lib/xmps/Codecs/libsmpeg.so
lib/xmps/Renderers/libSDL.so
lib/xmps/Renderers/libX11.so
share/gnome/apps/Multimedia/XMPS.desktop
+share/gnome/pixmaps/xmps.png
+share/gnome/xmps/skins/DarkDepth/buttons.xpm
+share/gnome/xmps/skins/DarkDepth/config
+share/gnome/xmps/skins/DarkDepth/controls.xpm
+share/gnome/xmps/skins/DarkDepth/digits.xpm
+share/gnome/xmps/skins/DarkDepth/main.xpm
+share/gnome/xmps/skins/DarkDepth/playlist.xpm
+share/gnome/xmps/skins/DarkDepth/titlebar.xpm
+share/gnome/xmps/skins/default/buttons.xpm
+share/gnome/xmps/skins/default/config
+share/gnome/xmps/skins/default/controls.xpm
+share/gnome/xmps/skins/default/digits.xpm
+share/gnome/xmps/skins/default/main.xpm
+share/gnome/xmps/skins/default/playlist.xpm
+share/gnome/xmps/skins/default/titlebar.xpm
+share/gnome/xmps/xmps_intro.xpm
share/locale/fi/LC_MESSAGES/xmps.mo
share/locale/fr/LC_MESSAGES/xmps.mo
share/locale/pl/LC_MESSAGES/xmps.mo
share/locale/sv/LC_MESSAGES/xmps.mo
-share/gnome/pixmaps/xmps.png
-share/xmps/skins/DarkDepth/buttons.xpm
-share/xmps/skins/DarkDepth/config
-share/xmps/skins/DarkDepth/controls.xpm
-share/xmps/skins/DarkDepth/digits.xpm
-share/xmps/skins/DarkDepth/main.xpm
-share/xmps/skins/DarkDepth/playlist.xpm
-share/xmps/skins/DarkDepth/titlebar.xpm
-share/xmps/skins/default/buttons.xpm
-share/xmps/skins/default/config
-share/xmps/skins/default/controls.xpm
-share/xmps/skins/default/digits.xpm
-share/xmps/skins/default/main.xpm
-share/xmps/skins/default/playlist.xpm
-share/xmps/skins/default/titlebar.xpm
-share/xmps/xmps_intro.xpm
-@dirrm share/xmps/skins/default
-@dirrm share/xmps/skins/DarkDepth
-@dirrm share/xmps/skins
-@dirrm share/xmps
+@dirrm share/gnome/xmps/skins/default
+@dirrm share/gnome/xmps/skins/DarkDepth
+@dirrm share/gnome/xmps/skins
+@dirrm share/gnome/xmps
@dirrm lib/xmps/Renderers
@dirrm lib/xmps/Codecs
@dirrm lib/xmps