Index: Makefile =================================================================== --- Makefile (revision 498040) +++ Makefile (working copy) @@ -19,7 +19,8 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs RUN_DEPENDS= gnuplot:math/gnuplot -USES= compiler:openmp gmake perl5 +USES= gmake perl5 +USE_GCC= yes USE_JAVA= yes USE_GITHUB= yes @@ -27,6 +28,7 @@ JAVA_VERSION= 1.8+ GH_ACCOUNT= marbl +LDFLAGS_powerpc64+= -lgomp -lpthread WRKSRC_SUBDIR= src # Makefile compiles directly into ${DESTDIR}${PREFIX} MAKE_ENV+= DESTDIR=${WRKSRC} @@ -36,7 +38,7 @@ -e 's|-O4||g' \ -e 's|-funroll-loops||g' \ -e 's|-fexpensive-optimizations||g' \ - -e 's|amd64|${ARCH}|g' \ + -e 's|amd64|${ARCH:S/powerpc64/powerpc/}|g' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|\\$$bin/mhap-|${JAVAJARDIR}/mhap-|g' \ ${WRKSRC}/pipelines/canu/OverlapMhap.pm @@ -45,19 +47,19 @@ # Upstream does not want to use lib/perl5/site_perl post-build: - @${MKDIR} ${WRKSRC}${PREFIX}/FreeBSD-${ARCH}/lib/perl5 - ${MV} ${WRKSRC}${PREFIX}/FreeBSD-${ARCH}/lib/site_perl \ - ${WRKSRC}${PREFIX}/FreeBSD-${ARCH}/lib/perl5 + @${MKDIR} ${WRKSRC}${PREFIX}/FreeBSD-${ARCH:S/powerpc64/powerpc/}/lib/perl5 + ${MV} ${WRKSRC}${PREFIX}/FreeBSD-${ARCH:S/powerpc64/powerpc/}/lib/site_perl \ + ${WRKSRC}${PREFIX}/FreeBSD-${ARCH:S/powerpc64/powerpc/}/lib/perl5 do-install: @${MKDIR} ${STAGEDIR}${PREFIX} - (cd ${WRKSRC}${PREFIX}/FreeBSD-${ARCH} && \ + (cd ${WRKSRC}${PREFIX}/FreeBSD-${ARCH:S/powerpc64/powerpc/} && \ ${COPYTREE_BIN} bin ${STAGEDIR}${PREFIX}) # STRIP_CMD fails without this on 11.1 under poudriere @${CHMOD} u+w ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} \ `file ${STAGEDIR}${PREFIX}/bin/* | ${GREP} ELF | cut -d : -f 1` - (cd ${WRKSRC}${PREFIX}/FreeBSD-${ARCH} && \ + (cd ${WRKSRC}${PREFIX}/FreeBSD-${ARCH:S/powerpc64/powerpc/} && \ ${COPYTREE_SHARE} "lib share" ${STAGEDIR}${PREFIX}) .include