diff --git a/graphics/mandelbulber/Makefile b/graphics/mandelbulber/Makefile index d52374b0019..a7e5242fee9 100644 --- a/graphics/mandelbulber/Makefile +++ b/graphics/mandelbulber/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/10/16 03:51:10 bentley Exp $ +# $OpenBSD: Makefile,v 1.2 2012/05/24 08:36:05 jasper Exp $ COMMENT = 3D fractal renderer -V = 1.08 +V = 1.11 DISTNAME = mandelbulber${V} PKGNAME = mandelbulber-${V} @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB += atk-1.0 cairo gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg +WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 png z WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama WANTLIB += Xrandr Xrender c expat fontconfig freetype m pixman-1 @@ -26,7 +26,8 @@ WANTLIB += pthread pthread-stubs stdc++ xcb xcb-render xcb-shm MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mandelbulber/} MODULES = devel/gettext -LIB_DEPENDS = graphics/png x11/gtk+2 +LIB_DEPENDS = graphics/png \ + x11/gtk+2 NO_REGRESS = Yes diff --git a/graphics/mandelbulber/distinfo b/graphics/mandelbulber/distinfo index 927c69b684c..66f023ab358 100644 --- a/graphics/mandelbulber/distinfo +++ b/graphics/mandelbulber/distinfo @@ -1,5 +1,5 @@ -MD5 (mandelbulber1.08.tar.gz) = x9mVJgW63vtO7U9feAVZgw== -RMD160 (mandelbulber1.08.tar.gz) = ypZS/hYJAa+YlZc3RKAhS/ctfIc= -SHA1 (mandelbulber1.08.tar.gz) = 86ApOWBzeVNL3GXAI/14Bv+N6wA= -SHA256 (mandelbulber1.08.tar.gz) = ZCs3YSC9XaPIf/GFlJpmbrLgHuGLEgbOtHrJLFy142Q= -SIZE (mandelbulber1.08.tar.gz) = 1145324 +MD5 (mandelbulber1.11.tar.gz) = jSfI17KGtGEQinBjzWZt/g== +RMD160 (mandelbulber1.11.tar.gz) = JGFaZqHXROiVd/E0bYuHYKHlluo= +SHA1 (mandelbulber1.11.tar.gz) = gtViHQmwwnO9oPALp+kdeKV1fMU= +SHA256 (mandelbulber1.11.tar.gz) = P1eiP5HD2I8eKMuink8HbgPJvLl85+zdDNcTaHyrcU4= +SIZE (mandelbulber1.11.tar.gz) = 1176248 diff --git a/graphics/mandelbulber/patches/patch-makefiles_makefile b/graphics/mandelbulber/patches/patch-makefiles_makefile index 6a91bec2917..cd5b03ed779 100644 --- a/graphics/mandelbulber/patches/patch-makefiles_makefile +++ b/graphics/mandelbulber/patches/patch-makefiles_makefile @@ -1,12 +1,12 @@ -$OpenBSD: patch-makefiles_makefile,v 1.1.1.1 2011/10/16 03:51:10 bentley Exp $ ---- makefiles/makefile.orig Fri Sep 30 10:08:25 2011 -+++ makefiles/makefile Fri Sep 30 10:08:37 2011 +$OpenBSD: patch-makefiles_makefile,v 1.2 2012/05/24 08:36:05 jasper Exp $ +--- makefiles/makefile.orig Thu May 24 10:25:44 2012 ++++ makefiles/makefile Thu May 24 10:26:31 2012 @@ -44,7 +44,7 @@ all: mandelbulber mandelbulber: $(OBJS) $(USER_OBJS) @echo 'Building target: $@' @echo 'Invoking: GCC C++ Linker' -- g++ `pkg-config --libs gtk+-2.0 gthread-2.0` -o"mandelbulber"$(OBJS) $(USER_OBJS) $(LIBS) -+ ${CXX} ${LDFLAGS} `pkg-config --libs gtk+-2.0 gthread-2.0` -o"mandelbulber"$(OBJS) $(USER_OBJS) $(LIBS) +- g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS) `pkg-config --libs gtk+-2.0 gthread-2.0` ++ ${CXX} ${LDFLAGS} -o"mandelbulber" $(OBJS) $(USER_OBJS) $(LIBS) `pkg-config --libs gtk+-2.0 gthread-2.0` @echo 'Finished building target: $@' @echo ' ' diff --git a/graphics/mandelbulber/patches/patch-makefiles_src_subdir_mk b/graphics/mandelbulber/patches/patch-makefiles_src_subdir_mk index 92b63d22d32..4b609915ea0 100644 --- a/graphics/mandelbulber/patches/patch-makefiles_src_subdir_mk +++ b/graphics/mandelbulber/patches/patch-makefiles_src_subdir_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-makefiles_src_subdir_mk,v 1.1.1.1 2011/10/16 03:51:10 bentley Exp $ ---- makefiles/src/subdir.mk.orig Sun Aug 21 06:45:14 2011 -+++ makefiles/src/subdir.mk Fri Sep 30 01:34:28 2011 -@@ -65,7 +65,7 @@ CPP_DEPS += \ +$OpenBSD: patch-makefiles_src_subdir_mk,v 1.2 2012/05/24 08:36:05 jasper Exp $ +--- makefiles/src/subdir.mk.orig Sun Feb 12 12:07:21 2012 ++++ makefiles/src/subdir.mk Thu May 24 10:26:38 2012 +@@ -68,7 +68,7 @@ CPP_DEPS += \ src/%.o: ../src/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' diff --git a/graphics/mandelbulber/pkg/PLIST b/graphics/mandelbulber/pkg/PLIST index 6361b527c10..cfc085e8578 100644 --- a/graphics/mandelbulber/pkg/PLIST +++ b/graphics/mandelbulber/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/10/16 03:51:10 bentley Exp $ +@comment $OpenBSD: PLIST,v 1.2 2012/05/24 08:36:05 jasper Exp $ @bin bin/mandelbulber share/applications/ share/applications/mandelbulber.desktop @@ -48,6 +48,10 @@ share/mandelbulber/examples/hypercomplex - julia - environment mapping.fract share/mandelbulber/examples/interior - mandelbox scale 2.fract share/mandelbulber/examples/interior - mandelbulb power 2.fract share/mandelbulber/examples/interior - mandelbulb power 8.fract +share/mandelbulber/examples/iter fog 1.fract +share/mandelbulber/examples/iter fog 2.fract +share/mandelbulber/examples/iter fog 3.fract +share/mandelbulber/examples/iter fog 4.fract share/mandelbulber/examples/menger sponge - equirectangular projection.fract share/mandelbulber/examples/menger sponge 2.fract share/mandelbulber/examples/menger sponge 3.fract @@ -96,6 +100,8 @@ share/mandelbulber/icons/go-next.png share/mandelbulber/icons/go-previous.png share/mandelbulber/icons/go-up.png share/mandelbulber/icons/mandelbulber.png +share/mandelbulber/icons/object-rotate-left.png +share/mandelbulber/icons/object-rotate-right.png share/mandelbulber/textures/ share/mandelbulber/textures/background.jpg share/mandelbulber/textures/colour palette.jpg