The appended diff fixes some small problems, ie.
  o configure prefers gmkdir (misc/fileutils)
  o plugin install writes directly in /usr/local/ hierarchy

The diff also reflects new pkg/PLIST-{main,plugin} generated via make
plist.


Index: Makefile
===================================================================
RCS file: /pub/anoncvs/cvs/OpenBSD/ports/x11/gtk-vnc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    26 May 2008 20:11:00 -0000      1.3
+++ Makefile    12 Jul 2008 19:25:17 -0000
@@ -5,8 +5,8 @@ COMMENT-plugin=         gtk-vnc browser plugin
 
 V=                     0.3.6
 DISTNAME=              gtk-vnc-${V}
-PKGNAME-main=          ${DISTNAME}p0
-PKGNAME-plugin=                gtk-vnc-plugin-${V}
+PKGNAME-main=          ${DISTNAME}p1
+PKGNAME-plugin=                gtk-vnc-plugin-${V}p0
 
 SHARED_LIBS += gtk-vnc-1.0          0.0      # .0.1
 CATEGORIES=            x11 net
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure     12 Jul 2008 19:25:17 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig     Mon May  5 22:54:32 2008
++++ configure  Mon Jun 30 18:04:43 2008
+@@ -2384,7 +2384,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in mkdir gmkdir; do
++  for ac_prog in mkdir ; do
+        for ac_exec_ext in '' $ac_executable_extensions; do
+          { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_prog$ac_exec_ext"; } || continue
+          case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
Index: patches/patch-plugin_Makefile_in
===================================================================
RCS file: 
/pub/anoncvs/cvs/OpenBSD/ports/x11/gtk-vnc/patches/patch-plugin_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-plugin_Makefile_in
--- patches/patch-plugin_Makefile_in    13 May 2008 09:48:56 -0000      1.1
+++ patches/patch-plugin_Makefile_in    12 Jul 2008 19:25:17 -0000
@@ -1,12 +1,48 @@
-$OpenBSD: patch-plugin_Makefile_in,v 1.1 2008/05/13 09:48:56 ajacoutot Exp $
---- plugin/Makefile.in.orig    Sat May 10 12:17:22 2008
-+++ plugin/Makefile.in Sat May 10 12:18:01 2008
+$OpenBSD$
+--- plugin/Makefile.in.orig    Mon May  5 22:54:31 2008
++++ plugin/Makefile.in Sat Jul 12 14:17:21 2008
 @@ -232,7 +232,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 [EMAIL PROTECTED]@plugindir = $(libdir)/mozilla/plugins
[EMAIL PROTECTED]@plugindir = $(libdir)/mozilla-plugins
[EMAIL PROTECTED]@plugindir = $(PREFIX)/lib/mozilla-plugins
  @[EMAIL PROTECTED] = gtk-vnc-plugin.la
  @[EMAIL PROTECTED] = \
  @ENABLE_PLUGIN_TRUE@  gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c
+@@ -285,12 +285,12 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+-      test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
++      test -z "$(plugindir)" || $(MKDIR_P) "$(plugindir)"
+       @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install 
$(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' 
'$(DESTDIR)$(plugindir)/$$f'"; \
+-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install 
$(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" 
"$(DESTDIR)$(plugindir)/$$f"; \
++          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install 
$(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(plugindir)/$$f'"; \
++          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install 
$(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(plugindir)/$$f"; \
+         else :; fi; \
+       done
+ 
+@@ -298,8 +298,8 @@ uninstall-pluginLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+-        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall 
rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+-        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f 
"$(DESTDIR)$(plugindir)/$$p"; \
++        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall 
rm -f '$(plugindir)/$$p'"; \
++        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f 
"$(plugindir)/$$p"; \
+       done
+ 
+ clean-pluginLTLIBRARIES:
+@@ -449,7 +449,7 @@ check: check-am
+ @[EMAIL PROTECTED]:
+ all-am: Makefile $(LTLIBRARIES) all-local
+ installdirs:
+-      for dir in "$(DESTDIR)$(plugindir)"; do \
++      for dir in "$(plugindir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
Index: pkg/PLIST-main
===================================================================
RCS file: /pub/anoncvs/cvs/OpenBSD/ports/x11/gtk-vnc/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main      13 May 2008 09:48:56 -0000      1.1
+++ pkg/PLIST-main      12 Jul 2008 19:25:17 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST-main,v 1.1 2008/05/13 09:48:56 ajacoutot Exp $
 @pkgpath ${BASE_PKGPATH}
-bin/gvncviewer
[EMAIL PROTECTED] bin/gvncviewer
 include/gtk-vnc-1.0/
 include/gtk-vnc-1.0/vncdisplay.h
 lib/libgtk-vnc-1.0.a
Index: pkg/PLIST-plugin
===================================================================
RCS file: /pub/anoncvs/cvs/OpenBSD/ports/x11/gtk-vnc/pkg/PLIST-plugin,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-plugin
--- pkg/PLIST-plugin    13 May 2008 09:48:56 -0000      1.1
+++ pkg/PLIST-plugin    12 Jul 2008 19:25:17 -0000
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST-plugin,v 1.1 2008/05/13 09:48:56 ajacoutot Exp $
 lib/mozilla-plugins/
-lib/mozilla-plugins/gtk-vnc-plugin.a
-lib/mozilla-plugins/gtk-vnc-plugin.la
 lib/mozilla-plugins/gtk-vnc-plugin.so
 share/examples/gtk-vnc/
 share/examples/gtk-vnc/README.plugin

Reply via email to