- update chbg to 2.0.1

x11/chbg/Makefile

@@ -1,43 +1,51 @@
-# $OpenBSD: Makefile,v 1.11 2008/01/04 17:48:38 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/03/25 20:54:42 jasper Exp $
 
 COMMENT=		Desktop wallpaper manager and X11 screensaver
 
-DISTNAME=		chbg-1.5
+DISTNAME=		chbg-2.0.1
 CATEGORIES=     	x11
 
-HOMEPAGE=		http://chbg.sf.net
-EXTRACT_SUFX=		.tgz
+HOMEPAGE=		http://www.beebgames.com/sw/gtk-ports.html
+EXTRACT_SUFX=		.tar.bz2
 
-# License: GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM= Yes 
 PERMIT_DISTFILES_FTP=	Yes 
-WANTLIB=		X11 Xext Xi c gdk glib gmodule gtk iconv intl jpeg m \
-			png tiff ungif z
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=chbg/}
+MASTER_SITES=		http://www.beebgames.com/sw/
 
-LIB_DEPENDS=		gdk_imlib.>=19::graphics/imlib
+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 += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
+WANTLIB += pthread-stubs xcb z
 
-CONFIGURE_ARGS=		--with-image-library=gdkimlib \
-			--with-imlib1-config=${LOCALBASE}/bin/imlib-config \
-			--with-gtk-config=${LOCALBASE}/bin/gtk-config
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng"
+LIB_DEPENDS=		gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 # Will install some stub files for gnome. Needed if Gnome not installed
 # when packaging.
 FAKE_FLAGS=		GNOME_PREFIX=${PREFIX}
 
+USE_GMAKE=		Yes
 USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
 
+MODULES=		devel/gettext
+
 SEPARATE_BUILD=		concurrent
 
 .if ${MACHINE_ARCH} == "sparc64"
 PATCH_LIST=		patch-* gcc-*
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && ${MAKE_PROGRAM} distclean
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chbg
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/chbg

x11/chbg/distinfo

@@ -1,5 +1,5 @@
-MD5 (chbg-1.5.tgz) = PuiwGn4IlXD2bYnaw1PMLA==
-RMD160 (chbg-1.5.tgz) = 25h0r6jjNPonuSPxvuDLD+A+VL4=
-SHA1 (chbg-1.5.tgz) = FdfqdffeK+MOc213cWcQ4l7v+5U=
-SHA256 (chbg-1.5.tgz) = Nq4YFsCKanpibcq/Z5KIWNy1454Feju+RViC9sbiISI=
-SIZE (chbg-1.5.tgz) = 322534
+MD5 (chbg-2.0.1.tar.bz2) = Tcg0OvLaa71+k5BLO/IIWQ==
+RMD160 (chbg-2.0.1.tar.bz2) = prAumpilbgMZNWxjH85XKup8mjo=
+SHA1 (chbg-2.0.1.tar.bz2) = L4CcIwofUVuTULLspEaWa8YOYEo=
+SHA256 (chbg-2.0.1.tar.bz2) = eGMBMCAI+OUakVVYou82TaEGln4tP7pHPk8hQonhL/0=
+SIZE (chbg-2.0.1.tar.bz2) = 376174

x11/chbg/patches/gcc-src_Makefile_in

@@ -1,9 +1,9 @@
-$OpenBSD: gcc-src_Makefile_in,v 1.1 2004/03/13 15:40:01 sturm Exp $
---- src/Makefile.in.orig	2004-03-11 20:20:25.000000000 +0100
-+++ src/Makefile.in	2004-03-11 20:21:49.000000000 +0100
-@@ -154,6 +154,9 @@ uninstall-binPROGRAMS:
- .c.o:
- 	$(COMPILE) -c $<
+$OpenBSD: gcc-src_Makefile_in,v 1.2 2010/03/25 20:54:42 jasper Exp $
+--- src/Makefile.in.orig	Thu Mar  9 22:56:49 2006
++++ src/Makefile.in	Thu Mar 25 21:44:37 2010
+@@ -160,6 +160,9 @@ uninstall-binPROGRAMS:
+ 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	done
  
 +config.o: $(srcdir)/config.c
 +	$(COMPILE) -O0 -c $(srcdir)/config.c

x11/chbg/pkg/PLIST

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 19:26:28 espie Exp $
-bin/chbg
+@comment $OpenBSD: PLIST,v 1.4 2010/03/25 20:54:42 jasper Exp $
+@bin bin/chbg
 @man man/man1/chbg.1
 share/control-center/
 share/control-center/.data/