Update to 3.1.54 and unbreak.

The pkg-plist is now generated semi-automatically.

math/octave-devel/Makefile

@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	octave
-PORTVERSION=	3.1.51
-PORTREVISION=	4
+PORTVERSION=	3.1.54
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/\
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/
-PKGNAMESUFFIX=  -devel
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Developer's version of math/octave
@@ -29,8 +28,6 @@ LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		umfpack.1:${PORTSDIR}/math/suitesparse \
 		qhull:${PORTSDIR}/math/qhull
 
-BROKEN=		does not compile
-
 LATEST_LINK=    octave-devel
 
 USE_BZIP2=	yes
@@ -76,13 +73,11 @@ PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 INCLUDES=	-I${LOCALBASE}/include -I${LOCALBASE}/include/metis
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CFLAGS+=	${INCLUDES}
+CXXFLAGS+=	${INCLUDES}
+CPPFLAGS+=	${INCLUDES}
 CONFIGURE_ENV+=	GPERF="${LOCALBASE}/bin/gperf" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS} ${INCLUDES}" \
-		CXXFLAGS="${CXXFLAGS} ${INCLUDES}" \
-		CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \
-		F77="${FC}" \
-		FFLAGS="${FFLAGS}" \
 		CC="${CC}" \
 		CXX="${CXX}" \
 		TERMIOS_H="termios.h"
@@ -112,5 +107,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
+	 ${RM} -f ${WRKDIR}/PLIST
+.for d in ${PREFIX}/include/octave-${OCTAVE_VERSION} ${PREFIX}/share/octave ${PREFIX}/libexec/octave ${PREFIX}/lib/octave-${OCTAVE_VERSION}
+	@${FIND} -s $d -not -type d | \
+	${SED} -e 's#^${PREFIX}/##' >> ${WRKDIR}/PLIST
+	@${FIND} $d -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${WRKDIR}/PLIST
+.endfor
+	cd ${WRKDIR} ; ${SED} -i -e "/PLIST/ r PLIST" ${TMPPLIST}
 
 .include <bsd.port.post.mk>

math/octave-devel/distinfo

@@ -1,3 +1,3 @@
-MD5 (octave-3.1.51.tar.bz2) = 389be5a9f130f369d598795bc97100a9
-SHA256 (octave-3.1.51.tar.bz2) = 08ce0a1788506c0c3f30d1b3d1604e0ab32c41735c6741dbaed1375f2f84136c
-SIZE (octave-3.1.51.tar.bz2) = 10709063
+MD5 (octave-3.1.54.tar.bz2) = b8194e4118a96e84733cf0206d333351
+SHA256 (octave-3.1.54.tar.bz2) = 08632812b9e3112f8986c8b3aa6acccb020462ee076baafc86d182a4880cefbf
+SIZE (octave-3.1.54.tar.bz2) = 11177218

math/octave-devel/files/patch-scripts+pkg+pkg.m

@@ -1,11 +1,11 @@
---- scripts/pkg/pkg.m~	2008-07-22 00:59:05.000000000 +0900
-+++ scripts/pkg/pkg.m	2008-08-23 05:47:31.000000000 +0900
-@@ -1242,7 +1242,7 @@
-     ## make
+--- scripts/pkg/pkg.m~	2009-03-09 11:04:57.000000000 +0900
++++ scripts/pkg/pkg.m	2009-03-09 11:05:12.000000000 +0900
+@@ -1239,7 +1239,7 @@
+     ## Make.
      if (exist (fullfile (src, "Makefile"), "file"))
        [status, output] = shell (cstrcat ("export INSTALLDIR=\"", desc.dir,
--					 "\"; make -C ", src));
-+					 "\"; gmake -C ", src));
+-					 "\"; make -C '", src, "'"));
++					 "\"; gmake -C '", src, "'"));
        if (status != 0)
  	rm_rf (desc.dir);
  	error ("'make' returned the following error: %s", output);