- update gerbv to 2.4.0

from andreas bihlmaier (MAINTAINER), with a tweak by me

cad/gerbv/Makefile

@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.6 2009/12/21 18:06:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/09/09 07:50:32 jasper Exp $
 
 COMMENT=		viewer for Gerber (RS-274X) files
-DISTNAME=		gerbv-1.0.2
-PKGNAME=		${DISTNAME}p4
+DISTNAME=		gerbv-2.4.0
 CATEGORIES=		cad graphics
 
-HOMEPAGE=		http://gerbv.sourceforge.net/
+HOMEPAGE=		http://gerbv.gpleda.org/
 
 MAINTAINER=		Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
 
+SHARED_LIBS +=  gerbv                     0.0 # 1.5
+
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -20,22 +21,18 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
 WANTLIB += pthread-stubs xcb z
+WANTLIB += gthread-2.0 pcre pthread xcb-render xcb-render-util
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gerbv/}
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		gdk-x11-2.0.>=0.14,gdk_pixbuf-2.0.>=0.14,gtk-x11-2.0.>=0.14::x11/gtk+2
+LIB_DEPENDS=		::x11/gtk+2
 RUN_DEPENDS=		::devel/desktop-file-utils
 
 USE_X11=		Yes
+USE_LIBTOOL =		Yes
 CONFIGURE_STYLE=	gnu
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/desktop/gerbv.desktop \
-		${PREFIX}/share/applications
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
-	${INSTALL_DATA} ${WRKSRC}/desktop/gerbv.png ${PREFIX}/share/pixmaps/
-
 .include <bsd.port.mk>

cad/gerbv/distinfo

@@ -1,5 +1,5 @@
-MD5 (gerbv-1.0.2.tar.gz) = LV3M2aBg6SkWu3pB71Qz5g==
-RMD160 (gerbv-1.0.2.tar.gz) = 9dfgD9lXb27Y0PHe5Ff8ndLJjCY=
-SHA1 (gerbv-1.0.2.tar.gz) = TtO9YE6va778ho8+tuN50o7MD4Q=
-SHA256 (gerbv-1.0.2.tar.gz) = h+xmTMWxYQR9AX8Mqfu13p5CgYbwEMH4aezQpjhODn0=
-SIZE (gerbv-1.0.2.tar.gz) = 1066247
+MD5 (gerbv-2.4.0.tar.gz) = VkMUF98tJG24fiJXgwl9dQ==
+RMD160 (gerbv-2.4.0.tar.gz) = N8awXaHGCKxM2N7/DlfOkeAOgoY=
+SHA1 (gerbv-2.4.0.tar.gz) = 8EA8qDRbx2VEKpdhiM/2i057xZU=
+SHA256 (gerbv-2.4.0.tar.gz) = RI0x1OxaIeVliPXHWNxpHegwOZi16TgSNFBepuL8Puw=
+SIZE (gerbv-2.4.0.tar.gz) = 2285912

cad/gerbv/patches/patch-icon-theme-installer

@@ -0,0 +1,15 @@
+$OpenBSD: patch-icon-theme-installer,v 1.1 2010/09/09 07:50:32 jasper Exp $
+--- icon-theme-installer.orig	Thu Sep  9 09:39:28 2010
++++ icon-theme-installer	Thu Sep  9 09:39:50 2010
+@@ -108,9 +108,11 @@ if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d'
+ 	exit 1
+ fi
+ 
++if false; then #stupid crap
+ if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
+ 	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+ 	exit 1
++fi
+ fi
+ 
+ if test -z "$SRC_DIR"; then

cad/gerbv/pkg/PFRAG.shared

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2010/09/09 07:50:32 jasper Exp $
+@lib lib/libgerbv.so.${LIBgerbv_VERSION}

cad/gerbv/pkg/PLIST

@@ -1,12 +1,40 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/12/21 18:06:39 ajacoutot Exp $
-bin/gerbv
+@comment $OpenBSD: PLIST,v 1.3 2010/09/09 07:50:32 jasper Exp $
+%%SHARED%%
+@bin bin/gerbv
+include/gerbv-2.4.0/
+include/gerbv-2.4.0/gerbv.h
+lib/libgerbv.a
+lib/libgerbv.la
+lib/pkgconfig/
+lib/pkgconfig/libgerbv.pc
 @man man/man1/gerbv.1
-share/applications/
 share/applications/gerbv.desktop
+@comment share/applications/mimeinfo.cache
 share/gerbv/
+share/gerbv/gerbv_icon.ico
 share/gerbv/scheme/
+share/gerbv/scheme/gerb-debug.scm
+share/gerbv/scheme/gerb-ps.scm
 share/gerbv/scheme/init.scm
-share/pixmaps/
-share/pixmaps/gerbv.png
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/16x16/
+share/icons/hicolor/16x16/apps/
+share/icons/hicolor/16x16/apps/gerbv-16.png
+share/icons/hicolor/22x22/
+share/icons/hicolor/22x22/apps/
+share/icons/hicolor/22x22/apps/gerbv-22.png
+share/icons/hicolor/24x24/
+share/icons/hicolor/24x24/apps/
+share/icons/hicolor/24x24/apps/gerbv-24.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/gerbv-32.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/gerbv-48.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/gerbv.svg