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

(-)math/gracetmpl/Makefile (-23 / +22 lines)
Lines 7-52 Link Here
7
#
7
#
8
8
9
PORTNAME=	gracetmpl
9
PORTNAME=	gracetmpl
10
PORTVERSION=	0.3.1
10
PORTVERSION=	0.3.2
11
PORTREVISION=	3
12
CATEGORIES=	math print
11
CATEGORIES=	math print
13
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
14
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
15
14
16
BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric.pth:${PORTSDIR}/math/py-numeric
15
BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
17
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric.pth:${PORTSDIR}/math/py-numeric
16
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
18
17
19
MAINTAINER=	ports@FreeBSD.org
18
MAINTAINER=	ports@FreeBSD.org
20
COMMENT=	Provide an easy way to use existing grace-files as a template
19
COMMENT=	Provide an easy way to use existing grace-files as a template
21
20
22
USE_REINPLACE=	yes
21
USE_BZIP2=	yes
23
USE_GETOPT_LONG=	yes
24
USE_PYTHON=	yes
22
USE_PYTHON=	yes
23
USE_GETOPT_LONG=	yes
24
USE_REINPLACE=	yes
25
USE_GMAKE=	yes
25
USE_GMAKE=	yes
26
MAKE_ARGS=	PREFIX="${PREFIX}" \
27
		BIN_PREFIX="${PREFIX}/bin" \
28
		LIB_PREFIX="${PREFIX}/lib" \
29
		INC_PREFIX="${PREFIX}/include" \
30
		DOC_PREFIX="${DOCSDIR}" \
31
		AR="${AR}" \
32
		CPP="${CXX} ${LDFLAGS}" \
33
		CPPFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
34
		CXX="${CXX}"
26
ALL_TARGET=	all pythonwrap
35
ALL_TARGET=	all pythonwrap
27
INSTALL_TARGET=	install python_install
36
INSTALL_TARGET=	install pythonwrap_install
28
29
.include <bsd.port.pre.mk>
30
31
.if ${OSVERSION} < 500041
32
CFLAGS+=	"${CPPFLAGS}"
33
MAKE_ENV=	LDFLAGS="${LDFLAGS}"
34
.endif
35
37
36
post-extract:
38
post-extract:
37
	@${CP} -f ${WRKSRC}/Makefile.defs.tmpl ${WRKSRC}/Makefile.defs
39
	@${ECHO_CMD} -n > ${WRKSRC}/Makefile.defs
38
40
39
post-patch:
41
post-patch:
40
	@${REINPLACE_CMD} -e "s|^PREFIX|#PREFIX|" ${WRKSRC}/Makefile.defs
42
	@${REINPLACE_CMD} -e 's|/gracetmpl\.a|/libgracetmpl.a|g' ${WRKSRC}/gracetmpl-config.in
41
	@${REINPLACE_CMD} -e "s@\(gracetmpl\.a\)@lib\1@g" \
43
	@${REINPLACE_CMD} -e 's|values\.h|float.h|g' ${WRKSRC}/gracetmpl.cpp
42
		-e "s|make|${GMAKE}|" -e "s|install -D|install|" \
43
		-e "s|^CPPFLAGS =|CPPFALGS+=|" ${WRKSRC}/Makefile
44
	@${REINPLACE_CMD} -e "s|values\.h|float.h|" ${WRKSRC}/gracetmpl.cpp
45
44
46
.if !defined(NOPORTDOCS)
47
post-install:
45
post-install:
46
.if !defined(NOPORTDOCS)
48
	@${MKDIR} ${DOCSDIR}
47
	@${MKDIR} ${DOCSDIR}
49
	@${CP} ${WRKSRC}/doc/html/* ${DOCSDIR}
48
	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOCSDIR}
50
.endif
49
.endif
51
50
52
.include <bsd.port.post.mk>
51
.include <bsd.port.mk>
(-)math/gracetmpl/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (gracetmpl-0.3.1.tar.gz) = 862bb697a7b533bfed816dc3869745a1
1
MD5 (gracetmpl-0.3.2.tar.bz2) = 889fb9c73f3cd85c1ab7b42ff06402b1
2
SIZE (gracetmpl-0.3.1.tar.gz) = 865491
2
SIZE (gracetmpl-0.3.2.tar.bz2) = 898445
(-)math/gracetmpl/files/patch-Makefile (-10 / +47 lines)
Lines 1-11 Link Here
1
--- Makefile.orig	Fri Oct 31 09:21:12 2003
1
--- Makefile.orig	Mon Sep 27 16:59:48 2004
2
+++ Makefile	Fri Oct 31 09:22:23 2003
2
+++ Makefile	Sun Jun  5 01:14:44 2005
3
@@ -52,7 +52,7 @@
3
@@ -58,10 +58,10 @@
4
 	$(AR) -r gracetmpl.a gracetmpl.o
5
 
6
 gracetmpldemo: gracetmpldemo.o gracetmpl.o
7
-	$(CPP) -o gracetmpldemo gracetmpldemo.o gracetmpl.o
8
+	$(CPP) ${LDFLAGS} -o gracetmpldemo gracetmpldemo.o gracetmpl.o
9
 
10
 envtest: envtest.o gracetmpl.o
11
 	$(CPP) -o envtest envtest.o gracetmpl.o
4
 	$(CPP) -o envtest envtest.o gracetmpl.o
5
 
6
 install: all
7
-	install -D -m 644 gracetmpl.h $(INC_PREFIX)/gracetmpl.h
8
-	install -D -m 644 gracetmpl.a $(LIB_PREFIX)/gracetmpl.a
9
-	install -D -m 755 gracetmpldemo $(BIN_PREFIX)/gracetmpldemo
10
-	install -D -m 755 gracetmpl-config $(BIN_PREFIX)/gracetmpl-config
11
+	${BSD_INSTALL_DATA} gracetmpl.h $(INC_PREFIX)/gracetmpl.h
12
+	${BSD_INSTALL_DATA} gracetmpl.a $(LIB_PREFIX)/libgracetmpl.a
13
+	${BSD_INSTALL_PROGRAM} gracetmpldemo $(BIN_PREFIX)/gracetmpldemo
14
+	${BSD_INSTALL_SCRIPT} gracetmpl-config $(BIN_PREFIX)/gracetmpl-config
15
 
16
 gracetmpl-config: gracetmpl-config.in Makefile.defs
17
 	sed -e 's!__PREFIX__!$(PREFIX)!g' \
18
@@ -79,7 +79,7 @@
19
 
20
 pythonwrap:
21
 	@if python python/prereq.py 2>/dev/null; then \
22
-	  (cd python; make); \
23
+	  (cd python; $(MAKE)); \
24
 	else \
25
 	  echo missing python numarray extension.; \
26
 	  echo not building python stuff; \
27
@@ -87,7 +87,7 @@
28
 
29
 pythonwrap_install:
30
 	@if python python/prereq.py 2>/dev/null; then \
31
-	  (cd python; make install); \
32
+	  (cd python; $(MAKE) install); \
33
 	else \
34
 	  echo not installing python stuff; \
35
 	fi
36
@@ -121,10 +121,10 @@
37
 	rm -fr doc/html
38
 
39
 test: gracetmpldemo pythonwrap
40
-	@cd tests; make
41
+	@cd tests; $(MAKE)
42
 
43
 testpics: gracetmpldemo pythonwrap
44
-	@cd tests; make pics
45
+	@cd tests; $(MAKE) pics
46
 
47
 web: doc
48
 	(cd doc/html; tar cvhzf ../../web-`date +%s`.tgz .)
(-)math/gracetmpl/files/patch-pygracetmpl.cc (-18 / +45 lines)
Lines 1-25 Link Here
1
--- python/src/pygracetmpl.cc.orig	Sat Oct 12 05:12:57 2002
1
--- python/src/pygracetmpl.cc.orig	Mon Sep 27 16:59:49 2004
2
+++ python/src/pygracetmpl.cc	Sun Dec  5 12:35:53 2004
2
+++ python/src/pygracetmpl.cc	Sun Jun  5 00:55:43 2005
3
@@ -1,11 +1,10 @@
3
@@ -1,15 +1,15 @@
4
 #include <gracetmpl.h>
4
 #include <gracetmpl.h>
5
 
5
 
6
-#include <Python.h>
6
+#include <string.h>
7
-#include <Numeric/arrayobject.h> /* numerical python header */
7
+#include <complex>
8
-
8
+#include <set>
9
 #include <string.h>
9
+
10
 #include <complex>
10
 /* python headers */
11
 #include <set>
11
 #include <Python.h>
12
+#include <Python.h>
12
 /* numarray headers */
13
+#include <Numeric/arrayobject.h> /* numerical python header */
13
 #include <numarray/numarray.h>
14
 #include <numarray/arrayobject.h>
14
 
15
 
16
-#include <string.h>
17
-#include <complex>
18
-#include <set>
19
-
15
 /********************************************************/
20
 /********************************************************/
16
 /******************* graceTMPL.data type ***************/
21
 /******************* graceTMPL.data type ***************/
17
@@ -179,7 +178,7 @@
22
 /********************************************************/
18
   int rows = dataArray->dimensions[1];
23
@@ -159,6 +159,7 @@
24
   PyArrayObject *dataArray = 0;
25
   GraceTMPL::Data *newData = 0;
26
   graceTMPL_dataObject *dataObject = 0;
27
+  int cols, rows;
28
   
29
   if (!PyArg_ParseTuple(args, "sO:graceTMPL.graph.addData(name, dataArray)",
30
 			&name, &oDataArray)){
31
@@ -178,9 +179,9 @@
32
 		    "data array has to have at least dimension 2 in first axis");
33
     return NULL;
34
   }
35
-  PyArray_INCREF(dataArray);
36
-  int cols = dataArray->dimensions[0];
37
-  int rows = dataArray->dimensions[1];
38
+  XXX_PyArray_INCREF(dataArray);
39
+  cols = dataArray->dimensions[0];
40
+  rows = dataArray->dimensions[1];
19
   if(cols > 4)
41
   if(cols > 4)
20
     cols = 4;
42
     cols = 4;
21
-  double **data = new (double *)[cols];
43
   double **data = new (double *)[cols];
22
+  double **data = new double *[cols];
44
@@ -191,7 +192,7 @@
23
   for(int c = 0; c < cols; ++c){
45
 			       c * dataArray->strides[0] +
24
     data[c] = new double[rows];
46
 			       r * dataArray->strides[1]);
25
     for(int r = 0; r < rows; ++r)
47
   }
48
-  PyArray_XDECREF(dataArray);
49
+  XXX_PyArray_XDECREF(dataArray);
50
   switch(cols){
51
   case 2:
52
     newData = new GraceTMPL::Data(std::string(name), rows,
(-)math/gracetmpl/pkg-plist (-10 / +17 lines)
Lines 1-49 Link Here
1
bin/gracetmpl-config
1
bin/gracetmpl-config
2
bin/gracetmpldemo
2
bin/gracetmpldemo
3
include/gracetmpl.h
3
include/gracetmpl.h
4
lib/libgracetmpl.a
5
%%PYTHON_INCLUDEDIR%%/graceTMPL/gracetmpl.h
4
%%PYTHON_INCLUDEDIR%%/graceTMPL/gracetmpl.h
6
@dirrm %%PYTHON_INCLUDEDIR%%/graceTMPL
5
lib/libgracetmpl.a
7
%%PYTHON_SITELIBDIR%%/graceTMPL/graceTMPL.so
6
%%PYTHON_SITELIBDIR%%/graceTMPL/graceTMPL.so
8
%%PYTHON_SITELIBDIR%%/graceTMPL.pth
7
%%PYTHON_SITELIBDIR%%/graceTMPL.pth
9
@dirrm %%PYTHON_SITELIBDIR%%/graceTMPL
10
%%PORTDOCS%%%%DOCSDIR%%/annotated.html
8
%%PORTDOCS%%%%DOCSDIR%%/annotated.html
11
%%PORTDOCS%%%%DOCSDIR%%/annotations.html
9
%%PORTDOCS%%%%DOCSDIR%%/annotations.html
12
%%PORTDOCS%%%%DOCSDIR%%/changes.html
10
%%PORTDOCS%%%%DOCSDIR%%/changes.html
13
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Data-members.html
11
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Data-members.html
14
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Data.gif
15
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Data.html
12
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Data.html
13
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Data.png
16
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Environment-members.html
14
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Environment-members.html
17
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Environment.html
15
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Environment.html
18
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1EnvironmentUser-members.html
16
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1EnvironmentUser-members.html
19
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1EnvironmentUser.gif
20
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1EnvironmentUser.html
17
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1EnvironmentUser.html
18
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1EnvironmentUser.png
21
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Graph-members.html
19
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Graph-members.html
22
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Graph.gif
23
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Graph.html
20
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Graph.html
21
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Graph.png
24
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Save-members.html
22
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Save-members.html
25
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Save.gif
26
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Save.html
23
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Save.html
24
%%PORTDOCS%%%%DOCSDIR%%/classGraceTMPL_1_1Save.png
27
%%PORTDOCS%%%%DOCSDIR%%/classes.html
25
%%PORTDOCS%%%%DOCSDIR%%/classes.html
28
%%PORTDOCS%%%%DOCSDIR%%/demo-annotated.jpg
26
%%PORTDOCS%%%%DOCSDIR%%/demo-annotated.jpg
29
%%PORTDOCS%%%%DOCSDIR%%/demo-output-big.jpg
27
%%PORTDOCS%%%%DOCSDIR%%/demo-output-big.jpg
30
%%PORTDOCS%%%%DOCSDIR%%/demo-output-small.jpg
31
%%PORTDOCS%%%%DOCSDIR%%/demo-template-big.jpg
28
%%PORTDOCS%%%%DOCSDIR%%/demo-template-big.jpg
32
%%PORTDOCS%%%%DOCSDIR%%/demo-template-small.jpg
33
%%PORTDOCS%%%%DOCSDIR%%/demo_outp_big.html
29
%%PORTDOCS%%%%DOCSDIR%%/demo_outp_big.html
34
%%PORTDOCS%%%%DOCSDIR%%/demo_tmpl_big.html
30
%%PORTDOCS%%%%DOCSDIR%%/demo_tmpl_big.html
35
%%PORTDOCS%%%%DOCSDIR%%/dictionary.html
31
%%PORTDOCS%%%%DOCSDIR%%/dictionary.html
36
%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
32
%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
37
%%PORTDOCS%%%%DOCSDIR%%/doxygen.gif
33
%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
38
%%PORTDOCS%%%%DOCSDIR%%/examples.html
34
%%PORTDOCS%%%%DOCSDIR%%/examples.html
39
%%PORTDOCS%%%%DOCSDIR%%/files.html
35
%%PORTDOCS%%%%DOCSDIR%%/files.html
40
%%PORTDOCS%%%%DOCSDIR%%/functions.html
36
%%PORTDOCS%%%%DOCSDIR%%/functions.html
37
%%PORTDOCS%%%%DOCSDIR%%/functions_func.html
38
%%PORTDOCS%%%%DOCSDIR%%/functions_type.html
39
%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
41
%%PORTDOCS%%%%DOCSDIR%%/gracetmpl_8h-source.html
40
%%PORTDOCS%%%%DOCSDIR%%/gracetmpl_8h-source.html
42
%%PORTDOCS%%%%DOCSDIR%%/hierarchy.html
41
%%PORTDOCS%%%%DOCSDIR%%/hierarchy.html
43
%%PORTDOCS%%%%DOCSDIR%%/index.html
42
%%PORTDOCS%%%%DOCSDIR%%/index.html
44
%%PORTDOCS%%%%DOCSDIR%%/installation.html
43
%%PORTDOCS%%%%DOCSDIR%%/installation.html
45
%%PORTDOCS%%%%DOCSDIR%%/namespaceGraceTMPL.html
44
%%PORTDOCS%%%%DOCSDIR%%/namespaceGraceTMPL.html
46
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers.html
45
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers.html
46
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers_enum.html
47
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers_eval.html
48
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers_func.html
49
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers_type.html
50
%%PORTDOCS%%%%DOCSDIR%%/namespacemembers_vars.html
47
%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
51
%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
48
%%PORTDOCS%%%%DOCSDIR%%/pages.html
52
%%PORTDOCS%%%%DOCSDIR%%/pages.html
49
%%PORTDOCS%%%%DOCSDIR%%/structGraceTMPL_1_1Save_1_1CopySrc-members.html
53
%%PORTDOCS%%%%DOCSDIR%%/structGraceTMPL_1_1Save_1_1CopySrc-members.html
Lines 54-59 Link Here
54
%%PORTDOCS%%%%DOCSDIR%%/test02.jpg
58
%%PORTDOCS%%%%DOCSDIR%%/test02.jpg
55
%%PORTDOCS%%%%DOCSDIR%%/test03.jpg
59
%%PORTDOCS%%%%DOCSDIR%%/test03.jpg
56
%%PORTDOCS%%%%DOCSDIR%%/test04.jpg
60
%%PORTDOCS%%%%DOCSDIR%%/test04.jpg
61
%%PORTDOCS%%%%DOCSDIR%%/test05.jpg
57
%%PORTDOCS%%%%DOCSDIR%%/tmpl_knowledge.html
62
%%PORTDOCS%%%%DOCSDIR%%/tmpl_knowledge.html
58
%%PORTDOCS%%%%DOCSDIR%%/todo.html
63
%%PORTDOCS%%%%DOCSDIR%%/todo.html
59
%%PORTDOCS%%@dirrm %%DOCSDIR%%
64
%%PORTDOCS%%@dirrm %%DOCSDIR%%
65
@dirrm %%PYTHON_SITELIBDIR%%/graceTMPL
66
@dirrm %%PYTHON_INCLUDEDIR%%/graceTMPL

Return to bug 82277