- fix build on hppa

- rename patch
- use SUBST_CMD
- set license

graphics/xbmbrowser/Makefile

@@ -1,23 +1,27 @@
-# $OpenBSD: Makefile,v 1.19 2010/04/24 20:18:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2010/08/25 18:00:56 jasper Exp $
 # $FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp $
 
 COMMENT=	view complete directories of X bitmaps and X pixmaps
 
 DISTNAME=	xbmbrowser5.1
-PKGNAME=	xbmbrowser-5.1p2
+PKGNAME=	xbmbrowser-5.1p3
 CATEGORIES=	graphics
 
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
+# Public Domain-ish
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt pthread-stubs xcb c
+WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c
 
 CONFIGURE_STYLE=imake
 USE_X11=	Yes
 NO_REGRESS=	Yes
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/Imakefile
+
 .include <bsd.port.mk>

graphics/xbmbrowser/patches/patch-Imakefile

@@ -1,18 +1,23 @@
-$OpenBSD: patch-a,v 1.2 2000/06/02 18:19:06 espie Exp $
+$OpenBSD: patch-Imakefile,v 1.1 2010/08/25 18:00:56 jasper Exp $
 --- Imakefile.orig	Fri Aug  4 05:19:36 1995
-+++ Imakefile	Fri Jun  2 20:15:40 2000
++++ Imakefile	Wed Aug 25 19:55:25 2010
 @@ -17,8 +17,8 @@
  #    -DNO_TRANS_COLOR    Turn off setting the `none' color in xpixmaps
  
          DO_XPMS = -DDO_XPMS
 -        XPM_INC = -I/usr/include/X11
 -        XPM_LIB = -L$(LIBDIR)/xpm -lXpm
-+        XPM_INC = -I/usr/X11R6/include/X11
++        XPM_INC = -I${X11BASE}/include/X11
 +        XPM_LIB = -lXpm
  
  
  # If you need this uncomment (particularly on decstations)
-@@ -48,6 +48,7 @@ LOCAL_LIBRARIES = $(XPM_LIB) XawClientLi
+@@ -44,10 +44,11 @@ LOCAL_LIBRARIES = $(XPM_LIB) XawClientLibs
+     CDEBUGFLAGS = DefaultCDebugFlags -DNDEBUG
+ #   CDEBUGFLAGS = -g
+ #   CDEBUGFLAGS = -g -DPARSE
+-#ifdef HPArchitecture
++#if defined(HPArchitecture) && !defined(OpenBSDArchitecture)
      CCOPTIONS = -Aa -D_HPUX_SOURCE
  #endif
  
@@ -20,7 +25,7 @@ $OpenBSD: patch-a,v 1.2 2000/06/02 18:19:06 espie Exp $
  # Sed substitions rule
  .sed: 
  	@echo 'SED SUBSTITUTIONS "$@.sed" ==> "$@"'
-@@ -57,7 +58,6 @@ LOCAL_LIBRARIES = $(XPM_LIB) XawClientLi
+@@ -57,7 +58,6 @@ LOCAL_LIBRARIES = $(XPM_LIB) XawClientLibs
  	     -e 's|==X_BITMAPS==|$(X_BITMAPS)|'   \
  	     -e '/==COLOR_SETTINGS_DIVIDER==/d'   \
  	     < $@.sed  >$@