[pkgsrc/trunk]: pkgsrc/www/nspluginwrapper Add patches from Steve O'Hara-Smit...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58996cc48260
branches:  trunk
changeset: 527267:58996cc48260
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Apr 02 22:38:44 2007 +0000

description:
Add patches from Steve O'Hara-Smith to enable build on DragonFlyBSD
No change on other platforms, so skipped PKGREVISION bump.  Steve
has already fed the patches back to the author.

Currently the package hardcodes some search paths from /usr/pkg - I have
an sent a question to the author as to how he would best like to handle
those in his framework.

diffstat:

 www/nspluginwrapper/distinfo         |   6 ++-
 www/nspluginwrapper/patches/patch-aa |  13 ++++++++-
 www/nspluginwrapper/patches/patch-ac |  33 +++++++++++++++++++++++
 www/nspluginwrapper/patches/patch-ad |  51 ++++++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 3 deletions(-)

diffs (134 lines):

diff -r 4f39e2fd51d1 -r 58996cc48260 www/nspluginwrapper/distinfo
--- a/www/nspluginwrapper/distinfo      Mon Apr 02 22:35:45 2007 +0000
+++ b/www/nspluginwrapper/distinfo      Mon Apr 02 22:38:44 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/22 22:33:45 abs Exp $
+$NetBSD: distinfo,v 1.2 2007/04/02 22:38:44 abs Exp $
 
 SHA1 (nspluginwrapper-0.9.91.3.tar.bz2) = bcd1e1a2260de022c6d5bc2bff802c8d381805d2
 RMD160 (nspluginwrapper-0.9.91.3.tar.bz2) = 660d928b508c342003f9ff3483ce8b8d25919e90
@@ -6,5 +6,7 @@
 SHA1 (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 7e242b356f417d6e60cb00eaec1b214010737c11
 RMD160 (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 62835a2d318363fe97ca79842f2caebbd0f9b94a
 Size (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 50757 bytes
-SHA1 (patch-aa) = 85b18c77b333eb41a2ce40a178f7edf31b6803da
+SHA1 (patch-aa) = 188cc6c7c4c60196db7634daa1fe5dd1fe2eb87f
 SHA1 (patch-ab) = 84082438c3cdac30de337137e06a707223ef85ce
+SHA1 (patch-ac) = d3960bc25f49db5d36f7781e0dfbe8b795744ae9
+SHA1 (patch-ad) = 806cc69b99b1f087724469693f0a853f8f479184
diff -r 4f39e2fd51d1 -r 58996cc48260 www/nspluginwrapper/patches/patch-aa
--- a/www/nspluginwrapper/patches/patch-aa      Mon Apr 02 22:35:45 2007 +0000
+++ b/www/nspluginwrapper/patches/patch-aa      Mon Apr 02 22:38:44 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/22 22:33:45 abs Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/02 22:38:44 abs Exp $
 
 --- configure.orig     2007-03-04 15:01:22.000000000 +0000
 +++ configure
@@ -40,3 +40,14 @@
  echo ""
  echo "NOTE: The object files are built at the place where configure is launched"
  exit 1
+@@ -458,6 +466,10 @@ if test "$host_os" = "linux"; then
+     echo "OS=linux" >> $config_mak
+     echo "#define HOST_LINUX 1" >> $config_h
+     echo "#define HOST_OS \"linux\"" >> $config_h
++elif test "$host_os" = "dragonfly"; then
++    echo "OS=dragonfly" >> $config_mak
++    echo "#define HOST_DRAGONFLY 1" >> $config_h
++    echo "#define HOST_OS \"dragonfly\"" >> $config_h
+ elif test "$host_os" = "freebsd"; then
+     echo "OS=freebsd" >> $config_mak
+     echo "#define HOST_FREEBSD 1" >> $config_h
diff -r 4f39e2fd51d1 -r 58996cc48260 www/nspluginwrapper/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nspluginwrapper/patches/patch-ac      Mon Apr 02 22:38:44 2007 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1 2007/04/02 22:38:44 abs Exp $
+
+--- ./src/npw-config.c.orig    2007-04-01 16:28:47.000000000 +0100
++++ ./src/npw-config.c
+@@ -124,6 +124,14 @@ static const char *get_system_mozilla_pl
+         };
+         dirs = freebsd_dirs;
+       }
++#elif defined(__DragonFly__)
++      {
++        static const char *dragonfly_dirs[] = {
++              "/usr/pkg/" LIB "/mozilla/plugins",
++              "/usr/pkg/" LIB "/firefox/plugins",
++        };
++        dirs = dragonfly_dirs;
++      }
+ #elif defined(__NetBSD__)
+       {
+         static const char *netbsd_dirs[] = {
+@@ -206,6 +214,13 @@ static const char **get_mozilla_plugin_d
+       "/usr/local/lib/npapi/linux-flashplugin",
+       "/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux",
+ #endif
++#if defined(__DragonFly__)
++      "/usr/pkg/lib/netscape/plugins",
++      "/usr/pkg/lib/firefox/plugins",
++      "/usr/pkg/lib/RealPlayer/mozilla",
++      "/usr/pkg/Acrobat5/Browsers/intellinux",
++      "/usr/pkg/Acrobat7/Browser/intellinux",
++#endif
+ #if defined(__NetBSD__)
+       "/usr/pkg/lib/netscape/plugins",
+       "/usr/pkg/lib/firefox/plugins",
diff -r 4f39e2fd51d1 -r 58996cc48260 www/nspluginwrapper/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nspluginwrapper/patches/patch-ad      Mon Apr 02 22:38:44 2007 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-ad,v 1.1 2007/04/02 22:38:44 abs Exp $
+
+--- Makefile.orig      2007-03-04 15:01:22.000000000 +0000
++++ Makefile
+@@ -46,6 +46,9 @@ X_LDFLAGS = -L$(x11prefix)/$(lib64) -lX1
+ ifeq ($(OS),netbsd)
+ X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
+ endif
++ifeq ($(OS),dragonfly)
++X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
++endif
+ 
+ ARCH_32 = $(ARCH)
+ ifeq ($(biarch), yes)
+@@ -78,7 +81,11 @@ npwrapper_RAWSRCS = npw-wrapper.c npw-rp
+ npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
+ npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os)
+ npwrapper_CFLAGS  = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS)
++ifeq ($(OS),dragonfly)
++npwrapper_LDFLAGS = $(X_LDFLAGS) -pthread
++else
+ npwrapper_LDFLAGS = $(X_LDFLAGS) -lpthread
++endif
+ npwrapper_LDFLAGS += $(GLIB_LDFLAGS)
+ 
+ npviewer_PROGRAM = npviewer.bin
+@@ -97,7 +104,11 @@ npviewer_CFLAGS += $(GTK_CFLAGS)
+ npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS)
+ endif
+ npviewer_CFLAGS  += $(MOZILLA_CFLAGS)
++ifeq ($(OS),dragonfly)
++npviewer_LDFLAGS += $(libdl_LDFLAGS) -pthread
++else
+ npviewer_LDFLAGS += $(libdl_LDFLAGS) -lpthread
++endif
+ ifeq ($(TARGET_ARCH),i386)
+ npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map
+ endif
+@@ -128,6 +139,12 @@ ifeq ($(OS),netbsd)
+ # XXX use the ELF decoder for native plugins too?
+ npconfig_LDFLAGS += -lpthread
+ endif
++ifeq ($(OS),dragonfly)
++# We will try to dlopen() the native plugin library. If that lib is
++# linked against libpthread, then so must our program too.
++# XXX use the ELF decoder for native plugins too?
++npconfig_LDFLAGS += -pthread
++endif
+ 
+ nploader_PROGRAM = npviewer
+ nploader_RAWSRCS = npw-viewer.sh