freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 2.3.1

Browse Source 
Approved by:	portmgr (pav)
This commit is contained in:
Thomas Abthorpe
2007-12-18 19:41:46 +00:00
parent b7018175ba
commit 12e6d89fb3
10 changed files with 98 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
misc/gnomesword/Makefile
View File

@@ -6,17 +6,15 @@
#
PORTNAME= gnomesword
PORTVERSION= 2.2.3
PORTREVISION= 2
PORTVERSION= 2.3.1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MASTER_SITES= SF
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= A bible interface utilizing the sword framework
RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell \
${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
${LOCALBASE}/lib/libsword-1.5.10.so:${PORTSDIR}/misc/sword
BUILD_DEPENDS= ${RUN_DEPENDS}
USE_GETTEXT= yes
@@ -27,6 +25,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --enable-gtkhtml
post-install:
.if !defined(NOPORTDOCS)

6
misc/gnomesword/distinfo
View File

@@ -1,3 +1,3 @@
MD5 (gnomesword-2.2.3.tar.gz) = b8b331e0b6fbb1a53c6a778a5fd9298f
SHA256 (gnomesword-2.2.3.tar.gz) = 9d3d23010b70ac9275216700a71a8c5835562e755529db821147a9440bd7ccf2
SIZE (gnomesword-2.2.3.tar.gz) = 3383086
MD5 (gnomesword-2.3.1.tar.gz) = fa3d7f06a390e40ca715aabf0e9d8a85
SHA256 (gnomesword-2.3.1.tar.gz) = 97690220529bcb51d90dd9bf392e615fa2e2dfc5f60b115fc3e556b6aca9d6ab
SIZE (gnomesword-2.3.1.tar.gz) = 4127235

10
misc/gnomesword/files/patch-Makefile.in
View File

@@ -1,6 +1,6 @@
--- Makefile.in.orig Tue Apr 24 13:34:53 2007
+++ Makefile.in Tue Apr 24 13:39:06 2007
@@ -69,8 +69,7 @@
--- Makefile.in.orig 2007-12-18 09:55:52.000000000 -0500
+++ Makefile.in 2007-12-18 09:55:52.000000000 -0500
@@ -66,8 +66,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -16,7 +16,7 @@
installdirs-am:
- for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"; do \
+ for dir in "$(DESTDIR)$(gnomemenudir)" do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -738,8 +737,7 @@
@@ -27,5 +27,5 @@
- install-gnomesworddocDATA
+install-data-am: install-data-local install-gnomemenuDATA
install-exec-am:
install-dvi: install-dvi-recursive

116
misc/gnomesword/files/patch-configure
View File

@@ -1,116 +0,0 @@
--- configure.orig Fri Apr 27 13:23:11 2007
+++ configure Fri Apr 27 13:27:18 2007
@@ -25114,12 +25114,12 @@
pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 >= 3.13\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 >= 3.13") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.13\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.13") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= 3.13" 2>/dev/null`
+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14 >= 3.13" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25132,12 +25132,12 @@
pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 >= 3.13\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 >= 3.13") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.13\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.13") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= 3.13" 2>/dev/null`
+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14 >= 3.13" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25156,9 +25156,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8 >= 3.13"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.13"`
else
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= 3.13"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.13"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKHTML_PKG_ERRORS" >&5
@@ -25196,12 +25196,12 @@
pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25214,12 +25214,12 @@
pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25238,9 +25238,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14"`
else
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKHTML_PKG_ERRORS" >&5
@@ -25262,8 +25262,8 @@
fi
-GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.8`"
-GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.8`
+GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
+GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
cat >>confdefs.h <<_ACEOF
#define GTKHTML_DATA_DIR "${GTKHTML_DATA_DIR}"
@@ -26038,10 +26038,10 @@
GTKMOZEMBED_VERSION=`pkg-config --modversion mozilla-gtkmozembed`
fi
fi
-GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION:0:3} # TODO improve extraction of x.y
-GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//./_}
-GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//[:alpha:]/}
-GTKMOZEMBED_VERSION=GTKMOZEMBED_VERSION_$GTKMOZEMBED_VERSION
+###GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION:0:3} # TODO improve extraction of x.y
+###GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//./_}
+###GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//[:alpha:]/}
+###GTKMOZEMBED_VERSION=GTKMOZEMBED_VERSION_$GTKMOZEMBED_VERSION

61
misc/gnomesword/pkg-plist
View File

@@ -1,21 +1,14 @@
bin/gnomesword2
share/applications/gnomesword.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/applications/gnomesword.desktop
share/gnomesword/bookmarks.glade
share/gnomesword/editor_note.xml
share/gnomesword/editor_studypad.xml
share/gnomesword/logo.png
share/gnomesword/module-manager.glade
share/gnomesword/prefs.glade
share/gnomesword/search-dialog.glade
share/gnomesword/sword3.png
share/gnome/help/gnomesword/C/authors.xml
share/gnome/help/gnomesword/C/figures/first_start.png
share/gnome/help/gnomesword/C/figures/gtkhtml3-vs-mozembed.png
share/gnome/help/gnomesword/C/figures/interface.png
share/gnome/help/gnomesword/C/figures/interface_biblepane-options.png
share/gnome/help/gnomesword/C/figures/interface_biblepane.png
@@ -60,6 +53,7 @@ share/gnome/help/gnomesword/C/start.xml
share/gnome/help/gnomesword/C/studypad.xml
share/gnome/help/gnomesword/de/authors.xml
share/gnome/help/gnomesword/de/figures/first_start.png
share/gnome/help/gnomesword/de/figures/gtkhtml3-vs-mozembed.png
share/gnome/help/gnomesword/de/figures/interface.png
share/gnome/help/gnomesword/de/figures/interface_biblepane-options.png
share/gnome/help/gnomesword/de/figures/interface_biblepane.png
@@ -103,6 +97,7 @@ share/gnome/help/gnomesword/de/start.xml
share/gnome/help/gnomesword/de/studypad.xml
share/gnome/help/gnomesword/fr/authors.xml
share/gnome/help/gnomesword/fr/figures/first_start.png
share/gnome/help/gnomesword/fr/figures/gtkhtml3-vs-mozembed.png
share/gnome/help/gnomesword/fr/figures/interface.png
share/gnome/help/gnomesword/fr/figures/interface_biblepane-options.png
share/gnome/help/gnomesword/fr/figures/interface_biblepane.png
@@ -144,7 +139,34 @@ share/gnome/help/gnomesword/fr/preferences.xml
share/gnome/help/gnomesword/fr/search.xml
share/gnome/help/gnomesword/fr/start.xml
share/gnome/help/gnomesword/fr/studypad.xml
%%DATADIR%%/arrow_down.png
%%DATADIR%%/arrow_down_box.png
%%DATADIR%%/arrow_up.png
%%DATADIR%%/arrow_up_box.png
%%DATADIR%%/bookmarks.glade
%%DATADIR%%/editor_note.xml
%%DATADIR%%/editor_studypad.xml
%%DATADIR%%/logo.png
%%DATADIR%%/module-manager.glade
%%DATADIR%%/navbar_versekey.glade
%%DATADIR%%/prefs.glade
%%DATADIR%%/search-dialog.glade
%%DATADIR%%/sword3.png
share/locale/bg/LC_MESSAGES/gnomesword.mo
share/locale/cs/LC_MESSAGES/gnomesword.mo
share/locale/de/LC_MESSAGES/gnomesword.mo
share/locale/en_GB/LC_MESSAGES/gnomesword.mo
share/locale/es/LC_MESSAGES/gnomesword.mo
share/locale/fi/LC_MESSAGES/gnomesword.mo
share/locale/fr/LC_MESSAGES/gnomesword.mo
share/locale/nb_NO/LC_MESSAGES/gnomesword.mo
share/locale/nl/LC_MESSAGES/gnomesword.mo
share/locale/pt/LC_MESSAGES/gnomesword.mo
share/locale/ru/LC_MESSAGES/gnomesword.mo
share/locale/sk/LC_MESSAGES/gnomesword.mo
share/locale/uk/LC_MESSAGES/gnomesword.mo
share/pixmaps/gnomesword/about.png
share/pixmaps/gnomesword/dlg-un-16.png
share/pixmaps/gnomesword/dlg-un.png
share/pixmaps/gnomesword/epiphany-bookmark-page.png
share/pixmaps/gnomesword/epiphany-bookmarks.png
@@ -157,24 +179,14 @@ share/pixmaps/gnomesword/gs2-48x48.ico
share/pixmaps/gnomesword/gs2-48x48.png
share/pixmaps/gnomesword/init-settings.png
share/pixmaps/gnomesword/logo.png
share/pixmaps/gnomesword/mozilla-icon.png
share/pixmaps/gnomesword/new_tab_button.png
share/pixmaps/gnomesword/splash.png
share/pixmaps/gnomesword/splash2.png
share/pixmaps/gnomesword/sword.png
share/pixmaps/gnomesword/sword3.png
share/pixmaps/gnomesword/tt.png
share/locale/bg/LC_MESSAGES/gnomesword.mo
share/locale/cs/LC_MESSAGES/gnomesword.mo
share/locale/de/LC_MESSAGES/gnomesword.mo
share/locale/en_GB/LC_MESSAGES/gnomesword.mo
share/locale/es/LC_MESSAGES/gnomesword.mo
share/locale/fi/LC_MESSAGES/gnomesword.mo
share/locale/fr/LC_MESSAGES/gnomesword.mo
share/locale/nl/LC_MESSAGES/gnomesword.mo
share/locale/ru/LC_MESSAGES/gnomesword.mo
share/locale/sk/LC_MESSAGES/gnomesword.mo
share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/pixmaps/gnomesword
@dirrm %%DATADIR%%
@dirrm share/gnome/help/gnomesword/fr/figures
@dirrm share/gnome/help/gnomesword/fr
@dirrm share/gnome/help/gnomesword/de/figures
@@ -182,6 +194,7 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
@dirrm share/gnomesword
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm share/locale/nb_NO/LC_MESSAGES
@dirrm share/locale/nb_NO
@dirrm share/pixmaps/gnomesword
%%PORTDOCS%%@dirrm %%DOCSDIR%%

9
misc/xiphos/Makefile
View File

@@ -6,17 +6,15 @@
#
PORTNAME= gnomesword
PORTVERSION= 2.2.3
PORTREVISION= 2
PORTVERSION= 2.3.1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MASTER_SITES= SF
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= A bible interface utilizing the sword framework
RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell \
${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
${LOCALBASE}/lib/libsword-1.5.10.so:${PORTSDIR}/misc/sword
BUILD_DEPENDS= ${RUN_DEPENDS}
USE_GETTEXT= yes
@@ -27,6 +25,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --enable-gtkhtml
post-install:
.if !defined(NOPORTDOCS)

6
misc/xiphos/distinfo
View File

@@ -1,3 +1,3 @@
MD5 (gnomesword-2.2.3.tar.gz) = b8b331e0b6fbb1a53c6a778a5fd9298f
SHA256 (gnomesword-2.2.3.tar.gz) = 9d3d23010b70ac9275216700a71a8c5835562e755529db821147a9440bd7ccf2
SIZE (gnomesword-2.2.3.tar.gz) = 3383086
MD5 (gnomesword-2.3.1.tar.gz) = fa3d7f06a390e40ca715aabf0e9d8a85
SHA256 (gnomesword-2.3.1.tar.gz) = 97690220529bcb51d90dd9bf392e615fa2e2dfc5f60b115fc3e556b6aca9d6ab
SIZE (gnomesword-2.3.1.tar.gz) = 4127235

10
misc/xiphos/files/patch-Makefile.in
View File

@@ -1,6 +1,6 @@
--- Makefile.in.orig Tue Apr 24 13:34:53 2007
+++ Makefile.in Tue Apr 24 13:39:06 2007
@@ -69,8 +69,7 @@
--- Makefile.in.orig 2007-12-18 09:55:52.000000000 -0500
+++ Makefile.in 2007-12-18 09:55:52.000000000 -0500
@@ -66,8 +66,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -16,7 +16,7 @@
installdirs-am:
- for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"; do \
+ for dir in "$(DESTDIR)$(gnomemenudir)" do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -738,8 +737,7 @@
@@ -27,5 +27,5 @@
- install-gnomesworddocDATA
+install-data-am: install-data-local install-gnomemenuDATA
install-exec-am:
install-dvi: install-dvi-recursive

116
misc/xiphos/files/patch-configure
View File

@@ -1,116 +0,0 @@
--- configure.orig Fri Apr 27 13:23:11 2007
+++ configure Fri Apr 27 13:27:18 2007
@@ -25114,12 +25114,12 @@
pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 >= 3.13\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 >= 3.13") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.13\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.13") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= 3.13" 2>/dev/null`
+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14 >= 3.13" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25132,12 +25132,12 @@
pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 >= 3.13\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 >= 3.13") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.13\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.13") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= 3.13" 2>/dev/null`
+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14 >= 3.13" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25156,9 +25156,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8 >= 3.13"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.13"`
else
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= 3.13"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.13"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKHTML_PKG_ERRORS" >&5
@@ -25196,12 +25196,12 @@
pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
+ pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25214,12 +25214,12 @@
pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
+ pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25238,9 +25238,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14"`
else
- GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8"`
+ GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKHTML_PKG_ERRORS" >&5
@@ -25262,8 +25262,8 @@
fi
-GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.8`"
-GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.8`
+GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
+GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
cat >>confdefs.h <<_ACEOF
#define GTKHTML_DATA_DIR "${GTKHTML_DATA_DIR}"
@@ -26038,10 +26038,10 @@
GTKMOZEMBED_VERSION=`pkg-config --modversion mozilla-gtkmozembed`
fi
fi
-GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION:0:3} # TODO improve extraction of x.y
-GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//./_}
-GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//[:alpha:]/}
-GTKMOZEMBED_VERSION=GTKMOZEMBED_VERSION_$GTKMOZEMBED_VERSION
+###GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION:0:3} # TODO improve extraction of x.y
+###GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//./_}
+###GTKMOZEMBED_VERSION=${GTKMOZEMBED_VERSION//[:alpha:]/}
+###GTKMOZEMBED_VERSION=GTKMOZEMBED_VERSION_$GTKMOZEMBED_VERSION

61
misc/xiphos/pkg-plist
View File

@@ -1,21 +1,14 @@
bin/gnomesword2
share/applications/gnomesword.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/applications/gnomesword.desktop
share/gnomesword/bookmarks.glade
share/gnomesword/editor_note.xml
share/gnomesword/editor_studypad.xml
share/gnomesword/logo.png
share/gnomesword/module-manager.glade
share/gnomesword/prefs.glade
share/gnomesword/search-dialog.glade
share/gnomesword/sword3.png
share/gnome/help/gnomesword/C/authors.xml
share/gnome/help/gnomesword/C/figures/first_start.png
share/gnome/help/gnomesword/C/figures/gtkhtml3-vs-mozembed.png
share/gnome/help/gnomesword/C/figures/interface.png
share/gnome/help/gnomesword/C/figures/interface_biblepane-options.png
share/gnome/help/gnomesword/C/figures/interface_biblepane.png
@@ -60,6 +53,7 @@ share/gnome/help/gnomesword/C/start.xml
share/gnome/help/gnomesword/C/studypad.xml
share/gnome/help/gnomesword/de/authors.xml
share/gnome/help/gnomesword/de/figures/first_start.png
share/gnome/help/gnomesword/de/figures/gtkhtml3-vs-mozembed.png
share/gnome/help/gnomesword/de/figures/interface.png
share/gnome/help/gnomesword/de/figures/interface_biblepane-options.png
share/gnome/help/gnomesword/de/figures/interface_biblepane.png
@@ -103,6 +97,7 @@ share/gnome/help/gnomesword/de/start.xml
share/gnome/help/gnomesword/de/studypad.xml
share/gnome/help/gnomesword/fr/authors.xml
share/gnome/help/gnomesword/fr/figures/first_start.png
share/gnome/help/gnomesword/fr/figures/gtkhtml3-vs-mozembed.png
share/gnome/help/gnomesword/fr/figures/interface.png
share/gnome/help/gnomesword/fr/figures/interface_biblepane-options.png
share/gnome/help/gnomesword/fr/figures/interface_biblepane.png
@@ -144,7 +139,34 @@ share/gnome/help/gnomesword/fr/preferences.xml
share/gnome/help/gnomesword/fr/search.xml
share/gnome/help/gnomesword/fr/start.xml
share/gnome/help/gnomesword/fr/studypad.xml
%%DATADIR%%/arrow_down.png
%%DATADIR%%/arrow_down_box.png
%%DATADIR%%/arrow_up.png
%%DATADIR%%/arrow_up_box.png
%%DATADIR%%/bookmarks.glade
%%DATADIR%%/editor_note.xml
%%DATADIR%%/editor_studypad.xml
%%DATADIR%%/logo.png
%%DATADIR%%/module-manager.glade
%%DATADIR%%/navbar_versekey.glade
%%DATADIR%%/prefs.glade
%%DATADIR%%/search-dialog.glade
%%DATADIR%%/sword3.png
share/locale/bg/LC_MESSAGES/gnomesword.mo
share/locale/cs/LC_MESSAGES/gnomesword.mo
share/locale/de/LC_MESSAGES/gnomesword.mo
share/locale/en_GB/LC_MESSAGES/gnomesword.mo
share/locale/es/LC_MESSAGES/gnomesword.mo
share/locale/fi/LC_MESSAGES/gnomesword.mo
share/locale/fr/LC_MESSAGES/gnomesword.mo
share/locale/nb_NO/LC_MESSAGES/gnomesword.mo
share/locale/nl/LC_MESSAGES/gnomesword.mo
share/locale/pt/LC_MESSAGES/gnomesword.mo
share/locale/ru/LC_MESSAGES/gnomesword.mo
share/locale/sk/LC_MESSAGES/gnomesword.mo
share/locale/uk/LC_MESSAGES/gnomesword.mo
share/pixmaps/gnomesword/about.png
share/pixmaps/gnomesword/dlg-un-16.png
share/pixmaps/gnomesword/dlg-un.png
share/pixmaps/gnomesword/epiphany-bookmark-page.png
share/pixmaps/gnomesword/epiphany-bookmarks.png
@@ -157,24 +179,14 @@ share/pixmaps/gnomesword/gs2-48x48.ico
share/pixmaps/gnomesword/gs2-48x48.png
share/pixmaps/gnomesword/init-settings.png
share/pixmaps/gnomesword/logo.png
share/pixmaps/gnomesword/mozilla-icon.png
share/pixmaps/gnomesword/new_tab_button.png
share/pixmaps/gnomesword/splash.png
share/pixmaps/gnomesword/splash2.png
share/pixmaps/gnomesword/sword.png
share/pixmaps/gnomesword/sword3.png
share/pixmaps/gnomesword/tt.png
share/locale/bg/LC_MESSAGES/gnomesword.mo
share/locale/cs/LC_MESSAGES/gnomesword.mo
share/locale/de/LC_MESSAGES/gnomesword.mo
share/locale/en_GB/LC_MESSAGES/gnomesword.mo
share/locale/es/LC_MESSAGES/gnomesword.mo
share/locale/fi/LC_MESSAGES/gnomesword.mo
share/locale/fr/LC_MESSAGES/gnomesword.mo
share/locale/nl/LC_MESSAGES/gnomesword.mo
share/locale/ru/LC_MESSAGES/gnomesword.mo
share/locale/sk/LC_MESSAGES/gnomesword.mo
share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/pixmaps/gnomesword
@dirrm %%DATADIR%%
@dirrm share/gnome/help/gnomesword/fr/figures
@dirrm share/gnome/help/gnomesword/fr
@dirrm share/gnome/help/gnomesword/de/figures
@@ -182,6 +194,7 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
@dirrm share/gnomesword
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm share/locale/nb_NO/LC_MESSAGES
@dirrm share/locale/nb_NO
@dirrm share/pixmaps/gnomesword
%%PORTDOCS%%@dirrm %%DOCSDIR%%