diff options
| -rw-r--r-- | www/w3m/distinfo | 4 | ||||
| -rw-r--r-- | www/w3m/options.mk | 19 | ||||
| -rw-r--r-- | www/w3m/patches/patch-aa | 15 | ||||
| -rw-r--r-- | www/w3m/patches/patch-ak | 15 |
4 files changed, 46 insertions, 7 deletions
diff --git a/www/w3m/distinfo b/www/w3m/distinfo index ae76c3b2c65..c1a91961186 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.19 2008/12/13 08:24:55 obache Exp $ +$NetBSD: distinfo,v 1.20 2008/12/13 08:52:13 obache Exp $ SHA1 (w3m-0.5.2.tar.gz) = 484522547ae6dbb342d3858a2a53a65451e273f9 RMD160 (w3m-0.5.2.tar.gz) = 09ce72d8ef5e621a2e49496b63e22f2773edbe79 Size (w3m-0.5.2.tar.gz) = 1906812 bytes +SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932 SHA1 (patch-ab) = 2d60d7a2946f13a185591c0b927cf0f8b5ea351b +SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa diff --git a/www/w3m/options.mk b/www/w3m/options.mk index 0d68cf9a335..5f47929ce2a 100644 --- a/www/w3m/options.mk +++ b/www/w3m/options.mk @@ -1,15 +1,17 @@ -# $NetBSD: options.mk,v 1.8 2008/12/13 04:21:28 obache Exp $ +# $NetBSD: options.mk,v 1.9 2008/12/13 08:52:13 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.w3m PKG_SUPPORTED_OPTIONS= inet6 w3m-lynx-key w3m-m17n w3m-unicode PKG_SUGGESTED_OPTIONS= w3m-m17n .if ${_W3M_USE_IMAGE} == "YES" -PKG_OPTIONS_OPTIONAL_GROUPS= imagelib -PKG_OPTIONS_GROUP.imagelib= w3m-image-gdk-pixbuf w3m-image-imlib \ - w3m-image-imlib2 +PKG_OPTIONS_REQUIRED_GROUPS+= imagelib PKG_SUGGESTED_OPTIONS+= w3m-image-gdk-pixbuf +.else +PKG_OPTIONS_OPTIONAL_GROUPS+= imagelib .endif +PKG_OPTIONS_GROUP.imagelib= w3m-image-gdk-pixbuf w3m-image-imlib \ + w3m-image-imlib2 w3m-image-gtk2 # Memo about W3m configuration: # @@ -54,7 +56,7 @@ CONFIGURE_ARGS+= --enable-keymap=w3m .endif PLIST_VARS+= image -.if ${_W3M_USE_IMAGE} == "YES" +.if !empty(PKG_OPTIONS:Mw3m-image-*) . for _imagelib in ${PKG_OPTIONS_GROUP.imagelib} . if !empty(PKG_OPTIONS:M${_imagelib}) _W3M_IMAGELIB= ${_imagelib:C|^w3m-image-||} @@ -65,7 +67,12 @@ CONFIGURE_ARGS+= --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB:Q} PLIST.image= yes BUILDLINK_DEPMETHOD.libXt?= build . include "../../x11/libXt/buildlink3.mk" -. include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk" +. if empty(_W3M_IMAGELIB:Mgtk2) +. include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk" +. else +USE_TOOLS+= pkg-config +. include "../../x11/${_W3M_IMAGELIB}/buildlink3.mk" +. endif .else CONFIGURE_ARGS+= --disable-image .endif diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa new file mode 100644 index 00000000000..7fb93802013 --- /dev/null +++ b/www/w3m/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.13 2008/12/13 08:53:27 obache Exp $ + +PKG_CONFIG points right location in pkgsrc. + +--- configure.orig 2007-05-31 12:17:05.000000000 +0000 ++++ configure +@@ -5602,8 +5602,6 @@ echo "${ECHO_T}$with_imagelib" >&6; } + with_gtk2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config +- else +- PKG_CONFIG=: + fi;; + esac + done diff --git a/www/w3m/patches/patch-ak b/www/w3m/patches/patch-ak new file mode 100644 index 00000000000..80a137e9c8c --- /dev/null +++ b/www/w3m/patches/patch-ak @@ -0,0 +1,15 @@ +$NetBSD: patch-ak,v 1.1 2008/12/13 08:52:13 obache Exp $ + +PKG_CONFIG points right location in pkgsrc. + +--- acinclude.m4.orig 2006-04-07 13:21:11.000000000 +0000 ++++ acinclude.m4 +@@ -652,8 +652,6 @@ AC_DEFUN([AC_W3M_IMAGE], + with_gtk2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config +- else +- PKG_CONFIG=: + fi;; + esac + done |