Attachment #59905 for bug #90073

View | Details | Raw Unified | Return to bug 90073
Collapse All | Expand All




# ex:ts=8
# New ports collection makefile for:	L-Breeder
# Date created:				30 May 2002
# Whom:					David Yeske <dyeske@yahoo.com> et al

# $FreeBSD: ports/biology/L-Breeder/Makefile,v 1.17 2005/11/11 14:29:09 garga Exp $
#

PORTNAME=	LBreeder
PORTVERSION=	1.0
PORTREVISION=	6
CATEGORIES=	biology
MASTER_SITES=	http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/
DISTNAME=	${PORTNAME}-source
EXTRACT_SUFX=	.tgz

MAINTAINER=	dyeske@yahoo.com
COMMENT=	Allows you to display and breed L-system forms

LIB_DEPENDS=	wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24

NO_WRKSUBDIR=	yes
BUILD_WRKSRC=	${WRKSRC}/Unix

WRKSRC=		${WRKDIR}/LBreeder/LBreeder
PATCH_WRKSRC=	${WRKDIR}/LBreeder
PLIST_FILES=	bin/L-Breeder

USE_ZIP=	yes
USE_X_PREFIX=	yes
USE_GL=		yes
USE_GMAKE=	yes

	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
.endif

 
	@${FIND} ${WRKDIR} -type f -name Makefile | \
		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
		's|/usr/lib/libm.a||; \
		s|-ldl||; \
		s|-lgtk||; \
		s|-lgmodule||; \
		s|-lpthread||; \
		s|-lgthread||; \
		s|/usr/lib/libGL.a|-lGL|; \
		s|/usr/lib/libGLU.so|-lGLU|; \
		s|-O2|"${CFLAGS} ${PTHREAD_CFLAGS}"|; \
		s|-lglib||; \
		s|g\+\+|${CXX} -I${X11BASE}/include|; \
		s|-lgdk||; \
		s|wx-config|${WX_CONFIG}|; \
		s|-lwx_gtk[[:space:]]|`${WX_CONFIG} --libs`|; \
		s|-lwx_gtk_gl|-lwx_gtk2_gl-2.4|'

do-install:
	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCSDIR}
.endif
	@${MKDIR} ${EXAMPLESDIR}
	@${INSTALL_DATA} ${WRKSRC}/Lsystems/* ${EXAMPLESDIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)L-Breeder/distinfo (-2 / +3 lines)
1	MD5 (LBreeder.tgz) = a9ce83f618217cf29fdf816f35ac7400	1	MD5 (LBreeder-source.zip) = 446a6cf44460ed7e4bb2eecfe33dae4a
2	SIZE (LBreeder.tgz) = 205110	2	SHA256 (LBreeder-source.zip) = e6c5189a3b3bfdc6911a1cd0cba3f440f2e4fa67d9cadc411ded1f6b1400026a
		3	SIZE (LBreeder-source.zip) = 131306

Lines 1-9 Link Here

(-)L-Breeder/files/patch-LBreeder::MyTextFrame.cpp (-9 lines)
1	--- LBreeder/MyTextFrame.cpp.orig Wed Aug 16 22:08:11 2000
2	+++ LBreeder/MyTextFrame.cpp Wed Nov 5 01:03:54 2003
3	@@ -1,5 +1,5 @@
4	-#include "wx/filedlg.h"
5	#include "MyTextFrame.h"
6	+#include "wx/filedlg.h"
7	#include "Ltypes.h" //for debugging messages
8
9	BEGIN_EVENT_TABLE(MyTextFrame, wxDialog)

Lines 1-10 Link Here

(-)L-Breeder/files/patch-LBreeder::MyTextFrame.h (-10 lines)
1	--- LBreeder/MyTextFrame.h.orig Wed Nov 5 01:03:14 2003
2	+++ LBreeder/MyTextFrame.h Wed Nov 5 01:03:22 2003
3	@@ -7,6 +7,7 @@
4	TF_TEXT};
5
6	#include <wx/dialog.h>
7	+#include <wx/button.h>
8	#include <wx/textctrl.h>
9	#include <wx/layout.h>
10




--- Lsystem/Lstring.cpp.orig	Wed Aug 16 18:54:26 2000
+++ Lsystem/Lstring.cpp	Wed Nov 19 22:05:11 2003
@@ -199,7 +199,7 @@
   
   if (sscanf(the_text.c_str(),"%f",&temp)==1)
     return temp;
-  return sqrt(-1);
+  return sqrtf(-1);
 
 }
 
@@ -329,13 +329,13 @@
   float param;
   int   conv,dummy;
   the_length=0;
-  if (the_pos==info_length()-1) return sqrt(-1);
-  if (bracketed_chars.find(the_text[the_pos])==string::npos) return sqrt(-1);
+  if (the_pos==info_length()-1) return sqrt(-1.0);
+  if (bracketed_chars.find(the_text[the_pos])==string::npos) return sqrt(-1.0);
 
   conv=sscanf(&(the_text.data()[the_pos+1]),"(%f)%n",&param,&the_length);
   if (conv==sscanf("","%n",&dummy)) {
     the_length=0;
-    return sqrt(-1);
+    return sqrt(-1.0);
   } else {
     return param;
   };




--- Unix/Makefile.orig	Fri Jul  2 10:06:30 2004
+++ Unix/Makefile	Wed Dec  7 07:46:56 2005
@@ -1,9 +1,10 @@
 src=../src/
+C_FLAGS= -I$(X11BASE)/include -I$(LOCALBASE)/include
 
 .PHONY : clean all
 
 all          : probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o
-	g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -lGL -lGLU -lglut -o LBreeder-${OSTYPE}
+	g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lGL -lGLU -lglut -o LBreeder
 
 GLUT_LBreeder.o : ${src}GLUT_LBreeder.cpp  ${src}GLUT_LBreeder.h
 	g++ -c  ${src}GLUT_LBreeder.cpp ${C_FLAGS}




--- thinair/environ.h.orig	Wed Aug 16 17:08:27 2000
+++ thinair/environ.h	Wed Nov 19 21:54:56 2003
@@ -35,17 +35,20 @@
      #include <minmax.h>
   #endif
 
-  #if __GNUC__ >= 2 && __GNUC_MINOR__ >= 6 && defined( __cplusplus )
+  #if ((__GNUC__ == 2 && __GNUC_MINOR__ >= 6) || __GNUC__ > 2) && defined( __cplusplus )
      #define  _HAS_BOOL
      #define  _STRING_CLASS
-     #if __GNUC__ >= 2 && __GNUC_MINOR__ < 7
+     #define  _ANSI_CPP_HEADERS
+     #if __GNUC__ == 2 && __GNUC_MINOR__ < 7
        #define  _STRING_HEADER   <g++/String.h>
        #define  _STRING          String
      #else
        #define  _STRING_HEADER   <string>
        #define  _STRING          string
        #define  _DIFFERING_RETURNS_ALLOWED
+       #if __GNUC__ == 2
        #include <stl.h>
+       #endif
      #endif
      #define  _HAS_INT64
 

Lines 1-7 Link Here

(-)L-Breeder/pkg-descr (-1 / +1 lines)
1	L-Breeder is a program which allows you to display, breed, and	1	L-Breeder is a program which allows you to display, breed, and
2	genetically engineered L-system forms.	2	genetically engineered L-system forms.
3		3
4	WWW: http://pixie.oum.ox.ac.uk/L-Breeder/	4	WWW: http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/
5		5
6	- David	6	- David
7	dyeske@yahoo.com	7	dyeske@yahoo.com




bin/LBreeder
%%PORTDOCS%%%%DOCSDIR%%/ReadMe.txt
%%PORTDOCS%%%%DOCSDIR%%/commands.html
%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
%%EXAMPLESDIR%%/AIRHORSE.LS
%%EXAMPLESDIR%%/AXIS.LS
%%EXAMPLESDIR%%/BASETREE.LS
%%EXAMPLESDIR%%/FERN.LS
%%EXAMPLESDIR%%/FRACT00.LS
%%EXAMPLESDIR%%/FRACT01.LS
%%EXAMPLESDIR%%/FRACT02.LS
%%EXAMPLESDIR%%/FRACT03.LS
%%EXAMPLESDIR%%/TREE00B.LS
%%EXAMPLESDIR%%/TREE00C.LS
%%EXAMPLESDIR%%/TREE02.LS
%%EXAMPLESDIR%%/TREE03.LS
%%EXAMPLESDIR%%/TREE04.LS
%%EXAMPLESDIR%%/TREE05.LS
%%EXAMPLESDIR%%/TREE06.LS
%%EXAMPLESDIR%%/TREE07.LS
%%EXAMPLESDIR%%/TREE11.LS
%%EXAMPLESDIR%%/TROPISM.LS
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%EXAMPLESDIR%%

Return to bug 90073

Lines 1-3 Link Here

(-)L-Breeder/Makefile (-31 / +16 lines)
		1	# ex:ts=8
1	# New ports collection makefile for: L-Breeder	2	# New ports collection makefile for: L-Breeder
2	# Date created: 30 May 2002	3	# Date created: 30 May 2002
3	# Whom: David Yeske <dyeske@yahoo.com> et al	4	# Whom: David Yeske <dyeske@yahoo.com> et al
Lines 5-30 Link Here
5	# $FreeBSD: ports/biology/L-Breeder/Makefile,v 1.17 2005/11/11 14:29:09 garga Exp $	6	# $FreeBSD: ports/biology/L-Breeder/Makefile,v 1.17 2005/11/11 14:29:09 garga Exp $
6	#	7	#
7		8
8	PORTNAME= L-Breeder	9	PORTNAME= LBreeder
9	PORTVERSION= 1.0	10	PORTVERSION= 1.0
10	PORTREVISION= 5	11	PORTREVISION= 6
11	CATEGORIES= biology	12	CATEGORIES= biology
12	MASTER_SITES= http://pixie.oum.ox.ac.uk/L-Breeder/	13	MASTER_SITES= http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/
13	DISTNAME= LBreeder	14	DISTNAME= ${PORTNAME}-source
14	EXTRACT_SUFX= .tgz
15		15
16	MAINTAINER= dyeske@yahoo.com	16	MAINTAINER= dyeske@yahoo.com
17	COMMENT= Allows you to display and breed L-system forms	17	COMMENT= Allows you to display and breed L-system forms
18		18
19	LIB_DEPENDS= wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24	19	LIB_DEPENDS= wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
20		20
21	DEPRECATED= "mastersite disappeared, no longer maintained by author"	21	NO_WRKSUBDIR= yes
22	EXPIRATION_DATE= 2005-12-31	22	BUILD_WRKSRC= ${WRKSRC}/Unix
23
24	WRKSRC= ${WRKDIR}/LBreeder/LBreeder
25	PATCH_WRKSRC= ${WRKDIR}/LBreeder
26	PLIST_FILES= bin/L-Breeder
27		23
		24	USE_ZIP= yes
28	USE_X_PREFIX= yes	25	USE_X_PREFIX= yes
29	USE_GL= yes	26	USE_GL= yes
30	USE_GMAKE= yes	27	USE_GMAKE= yes
Lines 42-67 Link Here
42	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"	39	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
43	.endif	40	.endif
44		41
45	post-patch:	42
46	@${FIND} ${WRKDIR} -type f -name Makefile \| \
47	${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
48	's\|/usr/lib/libm.a\|\|; \
49	s\|-ldl\|\|; \
50	s\|-lgtk\|\|; \
51	s\|-lgmodule\|\|; \
52	s\|-lpthread\|\|; \
53	s\|-lgthread\|\|; \
54	s\|/usr/lib/libGL.a\|-lGL\|; \
55	s\|/usr/lib/libGLU.so\|-lGLU\|; \
56	s\|-O2\|"${CFLAGS} ${PTHREAD_CFLAGS}"\|; \
57	s\|-lglib\|\|; \
58	s\|g\+\+\|${CXX} -I${X11BASE}/include\|; \
59	s\|-lgdk\|\|; \
60	s\|wx-config\|${WX_CONFIG}\|; \
61	s\|-lwx_gtk[[:space:]]\|`${WX_CONFIG} --libs`\|; \
62	s\|-lwx_gtk_gl\|-lwx_gtk2_gl-2.4\|'
63
64	do-install:	43	do-install:
65	@${INSTALL_PROGRAM} ${WRKSRC}/L-Breeder ${PREFIX}/bin	44	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
		45	.if !defined(NOPORTDOCS)
		46	@${MKDIR} ${DOCSDIR}
		47	@${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCSDIR}
		48	.endif
		49	@${MKDIR} ${EXAMPLESDIR}
		50	@${INSTALL_DATA} ${WRKSRC}/Lsystems/* ${EXAMPLESDIR}
66		51
67	.include <bsd.port.mk>	52	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)L-Breeder/files/patch-Lsystem::Lstring.cpp (-28 lines)
1	--- Lsystem/Lstring.cpp.orig Wed Aug 16 18:54:26 2000
2	+++ Lsystem/Lstring.cpp Wed Nov 19 22:05:11 2003
3	@@ -199,7 +199,7 @@
4
5	if (sscanf(the_text.c_str(),"%f",&temp)==1)
6	return temp;
7	- return sqrt(-1);
8	+ return sqrtf(-1);
9
10	}
11
12	@@ -329,13 +329,13 @@
13	float param;
14	int conv,dummy;
15	the_length=0;
16	- if (the_pos==info_length()-1) return sqrt(-1);
17	- if (bracketed_chars.find(the_text[the_pos])==string::npos) return sqrt(-1);
18	+ if (the_pos==info_length()-1) return sqrt(-1.0);
19	+ if (bracketed_chars.find(the_text[the_pos])==string::npos) return sqrt(-1.0);
20
21	conv=sscanf(&(the_text.data()[the_pos+1]),"(%f)%n",&param,&the_length);
22	if (conv==sscanf("","%n",&dummy)) {
23	the_length=0;
24	- return sqrt(-1);
25	+ return sqrt(-1.0);
26	} else {
27	return param;
28	};

Line 0 Link Here

(-)L-Breeder/files/patch-Unix-Makefile (+14 lines)
	1	--- Unix/Makefile.orig Fri Jul 2 10:06:30 2004
	2	+++ Unix/Makefile Wed Dec 7 07:46:56 2005
	3	@@ -1,9 +1,10 @@
	4	src=../src/
	5	+C_FLAGS= -I$(X11BASE)/include -I$(LOCALBASE)/include
	6
	7	.PHONY : clean all
	8
	9	all : probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o
	10	- g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -lGL -lGLU -lglut -o LBreeder-${OSTYPE}
	11	+ g++ probability.o mutprobs.o trackball.o Lparse.o GL_Ldraw.o Lline.o Lsys.o GLUT_LBreeder.o ${src}main.cpp -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lGL -lGLU -lglut -o LBreeder
	12
	13	GLUT_LBreeder.o : ${src}GLUT_LBreeder.cpp ${src}GLUT_LBreeder.h
	14	g++ -c ${src}GLUT_LBreeder.cpp ${C_FLAGS}

Lines 1-25 Link Here

(-)L-Breeder/files/patch-thinair::environ.h (-25 lines)
1	--- thinair/environ.h.orig Wed Aug 16 17:08:27 2000
2	+++ thinair/environ.h Wed Nov 19 21:54:56 2003
3	@@ -35,17 +35,20 @@
4	#include <minmax.h>
5	#endif
6
7	- #if __GNUC__ >= 2 && __GNUC_MINOR__ >= 6 && defined( __cplusplus )
8	+ #if ((__GNUC__ == 2 && __GNUC_MINOR__ >= 6) \|\| __GNUC__ > 2) && defined( __cplusplus )
9	#define _HAS_BOOL
10	#define _STRING_CLASS
11	- #if __GNUC__ >= 2 && __GNUC_MINOR__ < 7
12	+ #define _ANSI_CPP_HEADERS
13	+ #if __GNUC__ == 2 && __GNUC_MINOR__ < 7
14	#define _STRING_HEADER <g++/String.h>
15	#define _STRING String
16	#else
17	#define _STRING_HEADER <string>
18	#define _STRING string
19	#define _DIFFERING_RETURNS_ALLOWED
20	+ #if __GNUC__ == 2
21	#include <stl.h>
22	+ #endif
23	#endif
24	#define _HAS_INT64
25

Line 0 Link Here

(-)L-Breeder/pkg-plist (+24 lines)
	1	bin/LBreeder
	2	%%PORTDOCS%%%%DOCSDIR%%/ReadMe.txt
	3	%%PORTDOCS%%%%DOCSDIR%%/commands.html
	4	%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
	5	%%EXAMPLESDIR%%/AIRHORSE.LS
	6	%%EXAMPLESDIR%%/AXIS.LS
	7	%%EXAMPLESDIR%%/BASETREE.LS
	8	%%EXAMPLESDIR%%/FERN.LS
	9	%%EXAMPLESDIR%%/FRACT00.LS
	10	%%EXAMPLESDIR%%/FRACT01.LS
	11	%%EXAMPLESDIR%%/FRACT02.LS
	12	%%EXAMPLESDIR%%/FRACT03.LS
	13	%%EXAMPLESDIR%%/TREE00B.LS
	14	%%EXAMPLESDIR%%/TREE00C.LS
	15	%%EXAMPLESDIR%%/TREE02.LS
	16	%%EXAMPLESDIR%%/TREE03.LS
	17	%%EXAMPLESDIR%%/TREE04.LS
	18	%%EXAMPLESDIR%%/TREE05.LS
	19	%%EXAMPLESDIR%%/TREE06.LS
	20	%%EXAMPLESDIR%%/TREE07.LS
	21	%%EXAMPLESDIR%%/TREE11.LS
	22	%%EXAMPLESDIR%%/TROPISM.LS
	23	%%PORTDOCS%%@dirrm %%DOCSDIR%%
	24	@dirrm %%EXAMPLESDIR%%