Hi ports --

Attached is a small diff to update graphics/mandelbulber to its latest
version. Unfortunately, mandelbulber now requires a C++11 compiler, but
besides that the port structure remains the same.

Take maintainer. I think I used to have this one.

~Brian

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/mandelbulber/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile    10 Apr 2017 11:46:21 -0000      1.8
+++ Makefile    12 Jun 2017 19:04:05 -0000
@@ -2,14 +2,14 @@
 
 COMMENT =              3D fractal renderer
 
-V =                    1.15
-DISTNAME =             mandelbulber${V}
-PKGNAME =              mandelbulber-${V}
-REVISION =             1
+V =                    1.21
+DISTNAME =             mandelbulber${V}-1.orig
+PKGNAME =              mandelbulber-${V}.1
 
 CATEGORIES =           graphics
 
 HOMEPAGE =             http://mandelbulber.com
+MAINTAINER =           Brian Callahan <[email protected]>
 
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
@@ -17,7 +17,6 @@ PERMIT_PACKAGE_CDROM =        Yes
 WANTLIB += atk-1.0 c cairo fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
-WANTLIB += ${LIBCXX}
 
 MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=mandelbulber/}
 
@@ -25,6 +24,8 @@ LIB_DEPENDS =         graphics/png \
                        x11/gtk+2
 
 RUN_DEPENDS =          devel/desktop-file-utils
+
+COMPILER =             gcc
 
 NO_TEST =              Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/mandelbulber/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo    1 Jun 2013 14:51:10 -0000       1.3
+++ distinfo    12 Jun 2017 19:04:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (mandelbulber1.15.tar.gz) = QUqIgCAKwlx5pcfWeKsttaI3RxbiR35bN15FRcpOg4I=
-SIZE (mandelbulber1.15.tar.gz) = 1208566
+SHA256 (mandelbulber1.21-1.orig.tar.gz) = 
46WzI1JHBR3JpaRyZvKpqx+CT4IiWUvyN9UkIF9Q7fo=
+SIZE (mandelbulber1.21-1.orig.tar.gz) = 1076888
Index: patches/patch-makefiles_makefile
===================================================================
RCS file: /cvs/ports/graphics/mandelbulber/patches/patch-makefiles_makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-makefiles_makefile
--- patches/patch-makefiles_makefile    1 Jun 2013 14:51:10 -0000       1.3
+++ patches/patch-makefiles_makefile    12 Jun 2017 19:04:05 -0000
@@ -1,12 +1,13 @@
 $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
+Index: makefiles/makefile
+--- makefiles/makefile.orig
++++ makefiles/makefile
 @@ -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)
-+      ${CXX} ${LDFLAGS} -o"mandelbulber" $(OBJS) $(USER_OBJS) $(LIBS)
+-      g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(CXXFLAGS) 
$(CPPFLAGS) $(LDFLAGS) $(OBJS) $(USER_OBJS) $(LIBS)
++      ${CXX} -o"mandelbulber" $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) 
$(USER_OBJS) $(LIBS)
        @echo 'Finished building target: $@'
        @echo ' '
  
Index: patches/patch-makefiles_objects_mk
===================================================================
RCS file: /cvs/ports/graphics/mandelbulber/patches/patch-makefiles_objects_mk,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-makefiles_objects_mk
--- patches/patch-makefiles_objects_mk  23 Mar 2014 18:17:34 -0000      1.3
+++ patches/patch-makefiles_objects_mk  12 Jun 2017 19:04:05 -0000
@@ -1,10 +1,11 @@
 $OpenBSD: patch-makefiles_objects_mk,v 1.3 2014/03/23 18:17:34 kili Exp $
---- makefiles/objects.mk.orig  Sun May  5 17:29:00 2013
-+++ makefiles/objects.mk       Sun May  5 17:29:04 2013
+Index: makefiles/objects.mk
+--- makefiles/objects.mk.orig
++++ makefiles/objects.mk
 @@ -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 := -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 -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 -lpthread -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
  
Index: patches/patch-makefiles_src_subdir_mk
===================================================================
RCS file: 
/cvs/ports/graphics/mandelbulber/patches/patch-makefiles_src_subdir_mk,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-makefiles_src_subdir_mk
--- patches/patch-makefiles_src_subdir_mk       1 Jun 2013 14:51:10 -0000       
1.3
+++ patches/patch-makefiles_src_subdir_mk       12 Jun 2017 19:04:05 -0000
@@ -1,12 +1,13 @@
 $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
+Index: makefiles/src/subdir.mk
+--- makefiles/src/subdir.mk.orig
++++ makefiles/src/subdir.mk
 @@ -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} -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"$@" "$<"
+-      g++ -O3 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags 
gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(CXXFLAGS) 
$(CPPFLAGS) -o"$@" "$<"
++      ${CXX} -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 
gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(CXXFLAGS) 
$(CPPFLAGS) -o"$@" "$<"
        @echo 'Finished building: $<'
        @echo ' '
  

Reply via email to