ports/59863: [non maintainer] Unbreak graphics/evolvotron by updating to 0.2.3
Markus Brueffer
brueffer at phoenix-systems.de
Mon Dec 1 03:20:25 UTC 2003
>Number: 59863
>Category: ports
>Synopsis: [non maintainer] Unbreak graphics/evolvotron by updating to 0.2.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 30 19:20:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Markus Brueffer
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.1-CURRENT FreeBSD 5.1-CURRENT #11: Thu Nov 13 12:26:36 CET 2003 brueffer at cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386
>Description:
Unbreak graphics/evolvotron by updating to 0.2.3
Maintainer CC'ed
>How-To-Repeat:
>Fix:
--- evolvotron.diff begins here ---
diff -ruN evolvotron.orig/Makefile evolvotron/Makefile
--- evolvotron.orig/Makefile Mon Dec 1 01:50:03 2003
+++ evolvotron/Makefile Mon Dec 1 03:58:44 2003
@@ -5,7 +5,7 @@
# $FreeBSD: ports/graphics/evolvotron/Makefile,v 1.4 2003/11/17 12:28:58 trevor Exp $
PORTNAME= evolvotron
-PORTVERSION= 0.0.5
+PORTVERSION= 0.2.3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,21 +15,25 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-QTDIR?= ${X11BASE}
USE_QT_VER= 3
-
+USE_PYTHON= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
-MAKE_ENV= QTDIR="${QTDIR}"
-
-.include <bsd.port.pre.mk>
+MAKE_ENV= QTDIR="${QT_PREFIX}"
+CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
-.if ${OSVERSION} >= 501000
-BROKEN= "Does not compile"
-.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/' ${WRKSRC}/common.pro
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/evolvotron ${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKSRC}/evolvotron/evolvotron ${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKSRC}/evolvotron_mutate/evolvotron_mutate ${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKSRC}/evolvotron_render/evolvotron_render ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/evolvotron.html ${DOCSDIR}
+.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN evolvotron.orig/distinfo evolvotron/distinfo
--- evolvotron.orig/distinfo Mon Dec 1 01:50:03 2003
+++ evolvotron/distinfo Mon Dec 1 01:59:56 2003
@@ -1 +1 @@
-MD5 (evolvotron-0.0.5.tar.gz) = ee20e4bea2742202f336316bcfbba702
+MD5 (evolvotron-0.2.3.tar.gz) = 515461d06f247a54d810ed4178eed26c
diff -ruN evolvotron.orig/files/patch-common.pro evolvotron/files/patch-common.pro
--- evolvotron.orig/files/patch-common.pro Thu Jan 1 01:00:00 1970
+++ evolvotron/files/patch-common.pro Mon Dec 1 03:17:44 2003
@@ -0,0 +1,44 @@
+--- common.pro.orig Mon Nov 3 09:40:15 2003
++++ common.pro Mon Dec 1 03:16:47 2003
+@@ -29,8 +29,6 @@
+ # Now leaving these ON for general distribution as they DO have SOME effect
+ # (or at least they have in the past... see the README), and should be portable.
+
+-QMAKE_CXXFLAGS_RELEASE -= -O2
+-QMAKE_CXXFLAGS_RELEASE += -O3 -fomit-frame-pointer -funroll-loops -ffast-math
+
+ ##################
+ # Architecture specific optimisations
+@@ -38,23 +36,6 @@
+ # (On a different setup you may need to change what's subtracted out of the flags.)
+ # NB -march=X implies -mcpu=X... no need to specify both the same
+
+-contains(CONFIG_OPTS, p4 ){
+- QMAKE_CXXFLAGS_RELEASE -= -march=i386 -mcpu=i686
+- QMAKE_CXXFLAGS_RELEASE += -march=pentium4 -mfpmath=sse -msse2
+- BUILD_INFO+= Pentium4
+-}
+-
+-contains(CONFIG_OPTS, p3 ){
+- QMAKE_CXXFLAGS_RELEASE -= -march=i386 -mcpu=i686
+- QMAKE_CXXFLAGS_RELEASE += -march=pentium3 -mfpmath=sse -msse
+- BUILD_INFO+= Pentium3
+-}
+-
+-contains(CONFIG_OPTS, xp ){
+- QMAKE_CXXFLAGS_RELEASE -= -march=i386 -mcpu=i686
+- QMAKE_CXXFLAGS_RELEASE += -march=athlon-xp -mfpmath=sse -msse
+- BUILD_INFO+= Athlon-XP
+-}
+
+ ##################
+ # Optimisation insanity
+@@ -67,7 +48,7 @@
+ #######################################
+ # Version numbering. This is ENTIRELY controlled by what is echoed by the VERSION script
+
+-VERSION_NUMBER = $${system(../VERSION)}
++VERSION_NUMBER = $${system(./VERSION)}
+ QMAKE_CXXFLAGS_RELEASE += '-DEVOLVOTRON_VERSION="$$VERSION_NUMBER"'
+ QMAKE_CXXFLAGS_DEBUG += '-DEVOLVOTRON_VERSION="$$VERSION_NUMBER"'
+ QMAKE_CXXFLAGS_RELEASE += '-DEVOLVOTRON_BUILD="$$VERSION_NUMBER (Build options: $$BUILD_INFO Release)"'
diff -ruN evolvotron.orig/files/patch-dialog_mutation_parameters.h evolvotron/files/patch-dialog_mutation_parameters.h
--- evolvotron.orig/files/patch-dialog_mutation_parameters.h Mon Dec 1 01:50:03 2003
+++ evolvotron/files/patch-dialog_mutation_parameters.h Mon Dec 1 03:10:38 2003
@@ -1,5 +1,5 @@
---- dialog_mutation_parameters.h.orig Sun Mar 16 19:22:14 2003
-+++ dialog_mutation_parameters.h Sun Mar 16 19:22:32 2003
+--- libevolvotron/dialog_mutation_parameters.h.orig Mon Dec 1 03:09:32 2003
++++ libevolvotron/dialog_mutation_parameters.h Mon Dec 1 03:10:15 2003
@@ -23,6 +23,7 @@
#ifndef _dialog_mutation_parameters_h_
#define _dialog_mutation_parameters_h_
diff -ruN evolvotron.orig/files/patch-matrix.cpp evolvotron/files/patch-matrix.cpp
--- evolvotron.orig/files/patch-matrix.cpp Mon Dec 1 01:50:03 2003
+++ evolvotron/files/patch-matrix.cpp Mon Dec 1 03:13:39 2003
@@ -1,10 +1,10 @@
---- matrix.cpp.orig Thu Apr 17 17:49:39 2003
-+++ matrix.cpp Thu Apr 17 17:49:52 2003
+--- libevolvotron/matrix.cpp.orig Mon Dec 1 03:12:54 2003
++++ libevolvotron/matrix.cpp Mon Dec 1 03:13:12 2003
@@ -26,6 +26,7 @@
#include "random.h"
#include <iostream>
+#include <time.h>
+ //! Test code
void testmatrix_extract_runtime(Matrix<2,2,float>& m_out,const Matrix<3,3,float>& m_in)
- {
diff -ruN evolvotron.orig/pkg-plist evolvotron/pkg-plist
--- evolvotron.orig/pkg-plist Mon Dec 1 01:50:03 2003
+++ evolvotron/pkg-plist Mon Dec 1 03:53:01 2003
@@ -1 +1,5 @@
bin/evolvotron
+bin/evolvotron_mutate
+bin/evolvotron_render
+%%PORTDOCS%%share/doc/evolvotron/evolvotron.html
+%%PORTDOCS%%@dirrm share/doc/evolvotron
--- evolvotron.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list