Date: Wed, 9 Jul 2014 23:03:04 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361418 - in head/archivers/xmill: . files Message-ID: <201407092303.s69N34TN079056@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Wed Jul 9 23:03:04 2014 New Revision: 361418 URL: http://svnweb.freebsd.org/changeset/ports/361418 QAT: https://qat.redports.org/buildarchive/r361418/ Log: archivers/xmill: fix build with clang PR: 191372 Submitted by: tkato432 yahoo com Modified: head/archivers/xmill/Makefile head/archivers/xmill/files/patch-XMill-CompressMan.cpp head/archivers/xmill/files/patch-XMill-PPMDI.cpp Modified: head/archivers/xmill/Makefile ============================================================================== --- head/archivers/xmill/Makefile Wed Jul 9 21:40:49 2014 (r361417) +++ head/archivers/xmill/Makefile Wed Jul 9 23:03:04 2014 (r361418) @@ -10,16 +10,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Efficient compressor for XML WRKSRC= ${WRKDIR}/${PORTNAME} -MAKEFILE= makefile USES= dos2unix zip -DOS2UNIX_FILES= ${MAKEFILE} XMill/BZlib.cpp - -PLIST_FILES= bin/xcmill bin/xdemill bin/xmilltest bin/xmillexample \ - bin/xmillinspect bin/ppmzip +DOS2UNIX_FILES= ${MAKEFILE} XMill/*.cpp +MAKEFILE= makefile PORTDOCS= * PORTEXAMPLES= * +PLIST_FILES= bin/xcmill bin/xdemill bin/xmilltest bin/xmillexample \ + bin/xmillinspect bin/ppmzip OPTIONS_DEFINE= DOCS EXAMPLES @@ -30,11 +29,11 @@ post-patch: do-install: .for p in ${PLIST_FILES:T} - ${INSTALL_PROGRAM} ${WRKSRC}/unix/${p} ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC}/unix && ${INSTALL_PROGRAM} ${p} ${STAGEDIR}${PREFIX}/bin) .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/documentation/* ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/documentation && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR}) .include <bsd.port.mk> Modified: head/archivers/xmill/files/patch-XMill-CompressMan.cpp ============================================================================== --- head/archivers/xmill/files/patch-XMill-CompressMan.cpp Wed Jul 9 21:40:49 2014 (r361417) +++ head/archivers/xmill/files/patch-XMill-CompressMan.cpp Wed Jul 9 23:03:04 2014 (r361418) @@ -1,11 +1,11 @@ --- XMill/CompressMan.cpp.orig 2009-03-13 19:11:05.000000000 +0100 +++ XMill/CompressMan.cpp 2009-03-13 19:11:08.000000000 +0100 @@ -423,7 +423,7 @@ - UserCompressorFactory *compressor=compressorlist; - while(compressor!=NULL) - { -- printf("%lu =>",(unsigned int)compressor); -+ printf("%lu =>",(unsigned intptr_t)compressor); - printf("%s\n",compressor->GetName()); - compressor=compressor->next; - } + UserCompressorFactory *compressor=compressorlist; + while(compressor!=NULL) + { +- printf("%lu =>",(unsigned int)compressor); ++ printf("%lu =>",(unsigned)(intptr_t)compressor); + printf("%s\n",compressor->GetName()); + compressor=compressor->next; + } Modified: head/archivers/xmill/files/patch-XMill-PPMDI.cpp ============================================================================== --- head/archivers/xmill/files/patch-XMill-PPMDI.cpp Wed Jul 9 21:40:49 2014 (r361417) +++ head/archivers/xmill/files/patch-XMill-PPMDI.cpp Wed Jul 9 23:03:04 2014 (r361418) @@ -1,11 +1,11 @@ --- XMill/PPMDI.cpp.orig 2009-03-13 19:12:05.000000000 +0100 +++ XMill/PPMDI.cpp 2009-03-13 19:12:29.000000000 +0100 @@ -245,7 +245,7 @@ - - cleanup: - *outused = j; -- *inused = inlen - (int)endptr + (int)src; -+ *inused = inlen - (intptr_t)endptr + (intptr_t)src; - return ret; - } - + + cleanup: + *outused = j; +- *inused = inlen - (int)endptr + (int)src; ++ *inused = inlen - (intptr_t)endptr + (intptr_t)src; + return ret; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407092303.s69N34TN079056>