Update to mandelbulber-1.15.

ok sthen@
This commit is contained in:
bentley 2013-06-01 14:51:10 +00:00
parent 7572d9e1b1
commit 5f998570a2
6 changed files with 30 additions and 21 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:10:54 espie Exp $
# $OpenBSD: Makefile,v 1.4 2013/06/01 14:51:10 bentley Exp $
COMMENT = 3D fractal renderer
V = 1.11
V = 1.15
DISTNAME = mandelbulber${V}
PKGNAME = mandelbulber-${V}
CATEGORIES = graphics
HOMEPAGE = https://sites.google.com/site/mandelbulber/
HOMEPAGE = http://mandelbulber.com
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
@ -25,10 +25,13 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mandelbulber/}
MODULES = devel/gettext
LIB_DEPENDS = graphics/png \
x11/gtk+2
RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
MAKE_FLAGS = CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
MAKE_FLAGS = CXX="${CXX}" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
USE_GMAKE = Yes

View File

@ -1,5 +1,2 @@
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
SHA256 (mandelbulber1.15.tar.gz) = QUqIgCAKwlx5pcfWeKsttaI3RxbiR35bN15FRcpOg4I=
SIZE (mandelbulber1.15.tar.gz) = 1208566

View File

@ -1,12 +1,12 @@
$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
$OpenBSD: patch-makefiles_makefile,v 1.3 2013/06/01 14:51:10 bentley Exp $
--- makefiles/makefile.orig Sun May 5 17:24:23 2013
+++ makefiles/makefile Sun May 5 17:24:49 2013
@@ -44,7 +44,7 @@ all: mandelbulber
mandelbulber: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: GCC C++ Linker'
- 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`
- g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)
+ ${CXX} ${LDFLAGS} -o"mandelbulber" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-makefiles_objects_mk,v 1.1 2013/06/01 14:51:10 bentley Exp $
--- makefiles/objects.mk.orig Sun May 5 17:29:00 2013
+++ makefiles/objects.mk Sun May 5 17:29:04 2013
@@ -4,5 +4,5 @@
USER_OBJS :=
-LIBS := -lgthread-2.0 -lrt -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lpng -ljpeg
+LIBS := -lgthread-2.0 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lpng -ljpeg

View File

@ -1,12 +1,12 @@
$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 += \
$OpenBSD: patch-makefiles_src_subdir_mk,v 1.3 2013/06/01 14:51:10 bentley Exp $
--- makefiles/src/subdir.mk.orig Tue Apr 23 09:55:16 2013
+++ makefiles/src/subdir.mk Sun May 5 17:23:45 2013
@@ -71,7 +71,7 @@ CPP_DEPS += \
src/%.o: ../src/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
- g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+ ${CXX} -O2 -ffast-math -Wall -c -fmessage-length=0 ${CXXFLAGS} `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+ ${CXX} -ffast-math -Wall -c -fmessage-length=0 ${CXXFLAGS} `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2012/05/24 08:36:05 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2013/06/01 14:51:10 bentley Exp $
@bin bin/mandelbulber
share/applications/
share/applications/mandelbulber.desktop
share/mandelbulber/
share/mandelbulber/defaults