update yelp to 2.18.1

with suggestions by Mikolaj Kucharski
This commit is contained in:
jasper 2007-04-27 22:54:23 +00:00
parent f45a4303df
commit de73ca8b7f
5 changed files with 121 additions and 127 deletions

View File

@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2007/04/07 13:40:22 steven Exp $
# $OpenBSD: Makefile,v 1.20 2007/04/27 22:54:23 jasper Exp $
COMMENT= "GNOME help browser"
VERSION= 2.6.5
DISTNAME= yelp-${VERSION}
PKGNAME= ${DISTNAME}p4
DISTNAME= yelp-2.18.1
CATEGORIES= x11/gnome
HOMEPAGE= http://www.gnome.org/
@ -14,33 +12,38 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext \
Xrender art_lgpl_2 atk-1.0 audiofile bonobo-2 \
bonobo-activation bonoboui-2 bz2 c crypto esd fontconfig \
freetype gailutil gconf-2 gcrypt gdk-x11-2.0 \
gdk_pixbuf-2.0 glade-2.0 glib-2.0 gmodule-2.0 \
gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 \
gpg-error gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 popt cairo glitz png \
pthread ssl xml2 xslt z
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcursor Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 \
audiofile bonobo-2 bonobo-activation bonoboui-2 bz2 \
c cairo crypto dbus-1 dbus-glib-1 esd expat fontconfig \
freetype gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 \
glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \
gnomecanvas-2 gnomevfs-2 gobject-2.0 gpg-error gthread-2.0 \
gtk-x11-2.0 jpeg m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
plc4 plds4 png popt pthread ssl stdc++ util xml2 z
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.6/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.18/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser
RUN_DEPENDS= :scrollkeeper->=0.3.6:textproc/scrollkeeper \
:docbook-dsssl-*:textproc/docbook-dsssl
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
gtkhtml-2::x11/gnome/libgtkhtml \
exslt::textproc/libxslt
RUN_DEPENDS= :scrollkeeper->=0.3.14:textproc/scrollkeeper \
:docbook-dsssl-*:textproc/docbook-dsssl \
:gnome2-user-docs-*:x11/gnome/users-guide
LIB_DEPENDS= startup-notification-1::devel/startup-notification \
xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul::devel/xulrunner,-devel \
gnomeui-2::x11/gnome/libgnomeui \
exslt,xslt::textproc/libxslt
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ARGS+= --with-gecko=xulrunner \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/yelp/
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/xulrunner/include/" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (yelp-2.6.5.tar.bz2) = m9lK80Tuagv2mqb5y9a36Q==
RMD160 (yelp-2.6.5.tar.bz2) = 2a5kDeQDlUhe5OQ60D7Q47DBoyk=
SHA1 (yelp-2.6.5.tar.bz2) = LNLEEloBAWq51gr72baEIls7QB8=
SHA256 (yelp-2.6.5.tar.bz2) = BZuNScHzSz2nQDq6CH2GLnW3jMAY/zDcrFdkPST0Vxc=
SIZE (yelp-2.6.5.tar.bz2) = 654264
MD5 (yelp-2.18.1.tar.bz2) = hKu/5+BCcGy/IXUpV+Kb8w==
RMD160 (yelp-2.18.1.tar.bz2) = iq9+X383Np+mgi7tYV8RC6u+zSg=
SHA1 (yelp-2.18.1.tar.bz2) = ZuRGWWwikCKQ1mFLLTVrZNW9MEw=
SHA256 (yelp-2.18.1.tar.bz2) = Ot113hlVABWlJqh1vKZr6B9zkQVh8ahEk9dtmQcX0fo=
SIZE (yelp-2.18.1.tar.bz2) = 900142

View File

@ -1,49 +1,32 @@
--- ltmain.sh.orig Sun Dec 5 11:28:48 2004
+++ ltmain.sh Sun Dec 12 08:00:37 2004
@@ -1374,6 +1374,17 @@ EOF
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -2024,6 +2035,21 @@ EOF
$OpenBSD: patch-ltmain_sh,v 1.7 2007/04/27 22:54:23 jasper Exp $
--- ltmain.sh.orig Sat Mar 24 10:50:11 2007
+++ ltmain.sh Sat Mar 24 10:54:02 2007
@@ -2306,6 +2306,21 @@ EOF
fi
continue
;;
+
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
+
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
+
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2274,10 +2300,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
@@ -2572,10 +2587,6 @@ EOF
fi
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
@ -51,11 +34,11 @@
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5849,6 @@ relink_command=\"$relink_command\""
@@ -6300,40 +6311,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "X----------------------------------------------------------------------" | $Xsed
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
@ -88,7 +71,7 @@
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
- $echo "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
;;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2003/06/12 20:22:04 marcm Exp $
--- po/Makefile.in.in.orig Sat May 31 06:47:46 2003
+++ po/Makefile.in.in Sat May 31 06:47:58 2003
@@ -28,7 +28,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
libdir = @libdir@
-localedir = $(libdir)/locale
+localedir = $(datadir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po

View File

@ -1,11 +1,13 @@
@comment $OpenBSD: PLIST,v 1.12 2006/01/19 17:22:43 steven Exp $
@comment $OpenBSD: PLIST,v 1.13 2007/04/27 22:54:24 jasper Exp $
bin/gnome-help
bin/yelp
lib/bonobo/
lib/bonobo/servers/
lib/bonobo/servers/GNOME_Yelp.server
share/applications/
share/applications/yelp.desktop
share/icons/
share/icons/hicolor/
share/icons/hicolor/192x192/
share/icons/hicolor/192x192/apps/
share/icons/hicolor/192x192/apps/yelp-icon-big.png
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/yelp.mo
@ -19,6 +21,12 @@ share/locale/bg/LC_MESSAGES/yelp.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/yelp.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/yelp.mo
share/locale/br/
share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/yelp.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/yelp.mo
@ -29,6 +37,9 @@ share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/yelp.mo
share/locale/da/LC_MESSAGES/yelp.mo
share/locale/de/LC_MESSAGES/yelp.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/yelp.mo
share/locale/el/LC_MESSAGES/yelp.mo
share/locale/en_CA/
share/locale/en_CA/LC_MESSAGES/
@ -69,6 +80,12 @@ share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/yelp.mo
share/locale/kn/LC_MESSAGES/yelp.mo
share/locale/ko/LC_MESSAGES/yelp.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/yelp.mo
share/locale/ky/
share/locale/ky/LC_MESSAGES/
share/locale/ky/LC_MESSAGES/yelp.mo
share/locale/li/
share/locale/li/LC_MESSAGES/
share/locale/li/LC_MESSAGES/yelp.mo
@ -76,9 +93,9 @@ share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/yelp.mo
share/locale/lv/LC_MESSAGES/yelp.mo
share/locale/mi/
share/locale/mi/LC_MESSAGES/
share/locale/mi/LC_MESSAGES/yelp.mo
share/locale/mg/
share/locale/mg/LC_MESSAGES/
share/locale/mg/LC_MESSAGES/yelp.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/yelp.mo
@ -95,15 +112,20 @@ share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/yelp.mo
share/locale/nb/LC_MESSAGES/yelp.mo
share/locale/nds@NFE/
share/locale/nds@NFE/LC_MESSAGES/
share/locale/nds@NFE/LC_MESSAGES/yelp.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/yelp.mo
share/locale/nl/LC_MESSAGES/yelp.mo
share/locale/nn/LC_MESSAGES/yelp.mo
share/locale/no/LC_MESSAGES/yelp.mo
share/locale/nso/
share/locale/nso/LC_MESSAGES/
share/locale/nso/LC_MESSAGES/yelp.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/yelp.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/yelp.mo
@ -112,6 +134,9 @@ share/locale/pt/LC_MESSAGES/yelp.mo
share/locale/pt_BR/LC_MESSAGES/yelp.mo
share/locale/ro/LC_MESSAGES/yelp.mo
share/locale/ru/LC_MESSAGES/yelp.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/yelp.mo
share/locale/sk/LC_MESSAGES/yelp.mo
share/locale/sl/LC_MESSAGES/yelp.mo
share/locale/sq/
@ -129,62 +154,57 @@ share/locale/tg/LC_MESSAGES/yelp.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/yelp.mo
share/locale/tk/
share/locale/tk/LC_MESSAGES/
share/locale/tk/LC_MESSAGES/yelp.mo
share/locale/tr/LC_MESSAGES/yelp.mo
share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/yelp.mo
share/locale/uk/LC_MESSAGES/yelp.mo
share/locale/vi/LC_MESSAGES/yelp.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/yelp.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/yelp.mo
share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_HK/
share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/
share/locale/zu/LC_MESSAGES/
share/locale/zu/LC_MESSAGES/yelp.mo
share/sgml/docbook/yelp/
share/sgml/docbook/yelp/db2html-admon.xsl
share/sgml/docbook/yelp/db2html-biblio.xsl
share/sgml/docbook/yelp/db2html-block.xsl
share/sgml/docbook/yelp/db2html-callout.xsl
share/sgml/docbook/yelp/db2html-chunk.xsl
share/sgml/docbook/yelp/db2html-common.xsl
share/sgml/docbook/yelp/db2html-division.xsl
share/sgml/docbook/yelp/db2html-ebnf.xsl
share/sgml/docbook/yelp/db2html-footnote.xsl
share/sgml/docbook/yelp/db2html-glossary.xsl
share/sgml/docbook/yelp/db2html-header.xsl
share/sgml/docbook/yelp/db2html-html.xsl
share/sgml/docbook/yelp/db2html-index.xsl
share/sgml/docbook/yelp/db2html-inline.xsl
share/sgml/docbook/yelp/db2html-list.xsl
share/sgml/docbook/yelp/db2html-math.xsl
share/sgml/docbook/yelp/db2html-media.xsl
share/sgml/docbook/yelp/db2html-navbar.xsl
share/sgml/docbook/yelp/db2html-param.xsl
share/sgml/docbook/yelp/db2html-qanda.xsl
share/sgml/docbook/yelp/db2html-refentry.xsl
share/sgml/docbook/yelp/db2html-suppressed.xsl
share/sgml/docbook/yelp/db2html-synopsis.xsl
share/sgml/docbook/yelp/db2html-table.xsl
share/sgml/docbook/yelp/db2html-title.xsl
share/sgml/docbook/yelp/db2html-titlepage.xsl
share/sgml/docbook/yelp/db2html-toc.xsl
share/sgml/docbook/yelp/db2html-xref.xsl
share/sgml/docbook/yelp/db2html.xsl
share/sgml/docbook/yelp/gettext.xsl
share/sgml/docbook/yelp/l10n.xml
share/sgml/docbook/yelp/man2html.xsl
share/schemas/
share/schemas/yelp/
share/schemas/yelp/yelp.schemas
share/yelp/
share/yelp/default.css
share/yelp/icons/
share/yelp/icons/caution.png
share/yelp/icons/important.png
share/yelp/icons/note.png
share/yelp/icons/tip.png
share/yelp/icons/warning.png
share/yelp/icons/yelp-icon-caution.png
share/yelp/icons/yelp-icon-important.png
share/yelp/icons/yelp-icon-note.png
share/yelp/icons/yelp-icon-tip.png
share/yelp/icons/yelp-icon-warning.png
share/yelp/icons/yelp-watermark-blockquote-00AB.png
share/yelp/icons/yelp-watermark-blockquote-00BB.png
share/yelp/icons/yelp-watermark-blockquote-201C.png
share/yelp/icons/yelp-watermark-blockquote-201D.png
share/yelp/icons/yelp-watermark-blockquote-201E.png
share/yelp/important_docs.xml
share/yelp/info.xml
share/yelp/man.xml
share/yelp/scrollkeeper.xml
share/yelp/toc.xml
share/yelp/ui/
share/yelp/ui/yelp-search-ui.xml
share/yelp/ui/yelp-ui.xml
share/yelp/ui/yelp.glade
share/yelp/xslt/
share/yelp/xslt/db-title.xsl
share/yelp/xslt/db2html.xsl
share/yelp/xslt/info2html.xsl
share/yelp/xslt/man2html.xsl
share/yelp/xslt/search2html.xsl
share/yelp/xslt/toc2html.xsl
share/yelp/xslt/yelp-common.xsl
share/yelp/yelp.js