- update pcb to 20091103

ok andreas bihlmaier (MAINTAINER

cad/pcb/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2009/10/10 23:06:55 steven Exp $
+# $OpenBSD: Makefile,v 1.11 2010/09/09 07:51:22 jasper Exp $
 
 COMMENT=	printed circuit board layout tool
-DISTNAME=	pcb-20070912
-PKGNAME=	${DISTNAME}p5
+DISTNAME=	pcb-20091103
 CATEGORIES=	cad
 
-HOMEPAGE=	http://pcb.sourceforge.net/
+HOMEPAGE=	http://pcb.gpleda.org/
 
 MAINTAINER=	Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
 
@@ -19,25 +18,35 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 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 += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
-WANTLIB += png pthread-stubs xcb z
+WANTLIB += png pthread-stubs xcb z gd.>=20 gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gtk-x11-2.0 gthread-2.0 pthread xcb-render xcb-render-util
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
 
 RUN_DEPENDS=	::devel/m4 \
+		::devel/desktop-file-utils \
+		::graphics/ImageMagick \
+		::misc/shared-mime-info \
 		${MODTK_RUN_DEPENDS}
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	gd.>=20::graphics/gd \
-		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=	::graphics/gd \
+		::x11/gtk+2
 
-MODULES=	devel/gettext x11/tk
+MODULES=	devel/gettext \
+		textproc/intltool \
+		x11/tk
 
+USE_GMAKE=	Yes
 USE_X11=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--disable-doc --with-gui=gtk
+CONFIGURE_ARGS=	--disable-doc \
+		--with-gui=gtk \
+		--disable-update-desktop-database \
+		--disable-update-mime-database
+
 
 pre-configure:
-	@perl -pi -e 's,!!DOCDIR!!,${PREFIX}/share/doc/pcb,' \
-		${WRKSRC}/doc/pcb.1
+	${SUBST_CMD} ${WRKSRC}/doc/pcb.1
 
 post-install:
 	rm -rf ${PREFIX}/share/${DISTNAME}

cad/pcb/distinfo

@@ -1,5 +1,5 @@
-MD5 (pcb-20070912.tar.gz) = skM0sZ7AB9Q+98WBxHP2sA==
-RMD160 (pcb-20070912.tar.gz) = Y98BF9XMDZlaUwxETGMz1GrW2BU=
-SHA1 (pcb-20070912.tar.gz) = PfJ6jAr63f75bvG+T+3ZtTM6gik=
-SHA256 (pcb-20070912.tar.gz) = OqViopMyv1F0+fuGyFQnsUAJ9kaAQqZO/8sCauBY/Eo=
-SIZE (pcb-20070912.tar.gz) = 3836056
+MD5 (pcb-20091103.tar.gz) = ZZoTv/0iadOg+GUIp8FTGw==
+RMD160 (pcb-20091103.tar.gz) = bgzRpOG/kqQD89gFqjsGSTYMsE4=
+SHA1 (pcb-20091103.tar.gz) = SbG/VRsOTYgRq/Va9RXXell5fjE=
+SHA256 (pcb-20091103.tar.gz) = 24zwlLbrJdzng5PD3MYEqyNyvseT5t6IQOSy2w313cM=
+SIZE (pcb-20091103.tar.gz) = 4503621

cad/pcb/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.3 2009/10/10 23:06:55 steven Exp $
---- configure.orig	Thu Sep 13 01:46:17 2007
-+++ configure	Sun Oct 11 00:49:28 2009
-@@ -5810,7 +5810,7 @@ echo "${ECHO_T}no" >&6; }
+$OpenBSD: patch-configure,v 1.4 2010/09/09 07:51:22 jasper Exp $
+--- configure.orig	Wed Nov  4 00:07:00 2009
++++ configure	Wed Aug 25 18:41:34 2010
+@@ -14077,7 +14077,7 @@ echo "${ECHO_T}no" >&6; }
  fi
  
  

cad/pcb/patches/patch-doc_pcb_1

@@ -1,4 +1,4 @@
-$OpenBSD: patch-doc_pcb_1,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
+$OpenBSD: patch-doc_pcb_1,v 1.2 2010/09/09 07:51:22 jasper Exp $
 --- doc/pcb.1.orig	Tue Aug 24 23:44:24 2004
 +++ doc/pcb.1	Fri Jan  5 09:11:57 2007
 @@ -30,17 +30,14 @@ The
@@ -20,6 +20,6 @@ $OpenBSD: patch-doc_pcb_1,v 1.1.1.1 2007/01/05 16:52:21 steven Exp $
 -
 +.B tkinfo.
 +The HTML documentation is installed as
-+!!DOCDIR!!/pcb.html.
++${PREFIX}/share/doc/pcb/pcb.html.
  
  

cad/pcb/patches/patch-example_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-example_Makefile_in,v 1.3 2009/10/10 23:06:55 steven Exp $
---- example/Makefile.in.orig	Thu Sep 13 03:09:44 2007
-+++ example/Makefile.in	Sun Oct 11 00:48:47 2009
-@@ -204,7 +204,7 @@ sysconfdir = @sysconfdir@
+$OpenBSD: patch-example_Makefile_in,v 1.4 2010/09/09 07:51:22 jasper Exp $
+--- example/Makefile.in.orig	Wed Nov  4 00:05:40 2009
++++ example/Makefile.in	Wed Aug 25 18:41:34 2010
+@@ -276,7 +276,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@

cad/pcb/patches/patch-example_libraries_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-example_libraries_Makefile_in,v 1.3 2009/10/10 23:06:55 steven Exp $
---- example/libraries/Makefile.in.orig	Thu Sep 13 03:09:45 2007
-+++ example/libraries/Makefile.in	Sun Oct 11 00:48:47 2009
-@@ -192,7 +192,7 @@ sysconfdir = @sysconfdir@
+$OpenBSD: patch-example_libraries_Makefile_in,v 1.4 2010/09/09 07:51:22 jasper Exp $
+--- example/libraries/Makefile.in.orig	Wed Nov  4 00:05:42 2009
++++ example/libraries/Makefile.in	Wed Aug 25 18:41:34 2010
+@@ -264,7 +264,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@

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

@@ -0,0 +1,15 @@
+$OpenBSD: patch-icon-theme-installer,v 1.1 2010/09/09 07:51:22 jasper Exp $
+--- icon-theme-installer.orig	Wed Aug 25 18:54:22 2010
++++ icon-theme-installer	Wed Aug 25 18:55:12 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/pcb/pkg/DESCR

@@ -1,6 +1,6 @@
-PCB is an interactive printed circuit board editor. PCB includes a rats
-nest feature, design rule checking, and can provide industry standard
-RS-274-X (Gerber), NC drill, and centroid data (X-Y data) output for use
-in the board fabrication and assembly process. PCB offers high end
-features such as an autorouter and trace optimizer which can tremendously
-reduce layout time.
+PCB is an interactive printed circuit board editor for the X11 window
+system. PCB includes a rats nest feature, design rule checking, and can
+provide industry standard RS-274-X (Gerber), NC drill, and centroid data
+(X-Y data) output for use in the board fabrication and assembly process.
+PCB offers high end features such as an autorouter and trace optimizer
+which can tremendously reduce layout time.