Index: head/audio/optimfrog/Makefile =================================================================== --- head/audio/optimfrog/Makefile (revision 408635) +++ head/audio/optimfrog/Makefile (revision 408636) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= optimfrog PORTVERSION= 5.003 CATEGORIES= audio MASTER_SITES= http://losslessaudio.org/Downloads/A1C0/${DISTVERSION:S/.//}/FreeBSD/ DISTNAME= # OptimFROG_FreeBSD_${ARCH}_${DISTVERSION:S/.//} MAINTAINER= matthew@reztek.cz COMMENT?= Best-ratio lossless audio codec LICENSE= OptimFROG LICENSE_NAME= OptimFROG - License LICENSE_FILE= ${WRKSRC}/license.html #only available as html file LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -INSTALL_CONFLICTS?= optimfrog-sse2-[0-9]* +CONFLICTS_INSTALL?= optimfrog-sse2-[0-9]* ONLY_FOR_ARCHS?= amd64 i386 NO_CDROM= No commercial use NO_BUILD= yes USE_LDCONFIG= yes OPTIONS_DEFINE_i386= SSE2 OPTIONS_DEFINE?= # SSE2_DESCR= Use SSE2 instructions .include .if ${ARCH} == "amd64" DISTNAME= OptimFROG_FreeBSD_x64_${DISTVERSION:S/.//} .else # ${ARCH} == "i386" . if ${PORT_OPTIONS:MSSE2} DISTNAME= OptimFROG_FreeBSD_x86_SSE2_${DISTVERSION:S/.//} . else DISTNAME= OptimFROG_FreeBSD_x86_${DISTVERSION:S/.//} . endif .endif do-install: @(cd ${WRKSRC} && ./install.sh -d ${STAGEDIR}) .include Index: head/audio/optimfrog-sse2/Makefile =================================================================== --- head/audio/optimfrog-sse2/Makefile (revision 408635) +++ head/audio/optimfrog-sse2/Makefile (revision 408636) @@ -1,13 +1,13 @@ # $FreeBSD$ PKGNAMESUFFIX= -sse2 MASTERDIR= ${.CURDIR}/../optimfrog COMMENT= Best-ratio lossless audio codec (SSE2 required) -INSTALL_CONFLICTS= optimfrog-[0-9]* +CONFLICTS_INSTALL= optimfrog-[0-9]* ONLY_FOR_ARCHS= i386 OPTIONS_DEFAULT= SSE2 .include "${MASTERDIR}/Makefile" Index: head/devel/libdwarf/Makefile =================================================================== --- head/devel/libdwarf/Makefile (revision 408635) +++ head/devel/libdwarf/Makefile (revision 408636) @@ -1,36 +1,36 @@ # Created by: joerg@FreeBSD.org # $FreeBSD$ PORTNAME= libdwarf PORTVERSION= 20130207 CATEGORIES= devel MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/libdwarf/libdwarf-20130207.tar.gz/64b42692e947d5180e162e46c689dfbf/ MAINTAINER= joerg@FreeBSD.org COMMENT= Library to analyze DWARF debugging information in ELF files -INSTALL_CONFLICT= bsdlibdwarf* +CONFLICTS_INSTALL= bsdlibdwarf* MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/libdwarf GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I. -I${LOCALBASE}/include USES= dos2unix DOS2UNIX_GLOB= *.h PS_FILES= dwarf.v2.pdf index.v2.pdf libdwarf2.1.pdf libdwarf2p.1.pdf mips_extensions.pdf do-install: ${INSTALL_DATA} ${WRKSRC}/libdwarf.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/dwarf.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/libdwarf.h ${STAGEDIR}${PREFIX}/include ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/libdwarf .for f in ${PS_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/doc/libdwarf .endfor .include Index: head/devel/libedit/Makefile =================================================================== --- head/devel/libedit/Makefile (revision 408635) +++ head/devel/libedit/Makefile (revision 408636) @@ -1,29 +1,29 @@ # Created by: jasone # $FreeBSD$ PORTNAME= libedit PORTVERSION= ${EDITVERSION}.${EDITDATE} DISTVERSION= ${EDITDATE}-${EDITVERSION} PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://thrysoee.dk/editline/ MAINTAINER= bapt@FreeBSD.org COMMENT= Command line editor library LICENSE= BSD2CLAUSE USES= libtool ncurses pathfix EDITVERSION= 3.1 EDITDATE= 20150325 WRKSRC= ${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-widec MAKE_ENV= LC_ALL=C LDFLAGS+= -L${LOCALBASE}/lib -CONFLICT_INSTALL= editline-* +CONFLICTS_INSTALL= editline-* .include Index: head/math/why3/Makefile =================================================================== --- head/math/why3/Makefile (revision 408635) +++ head/math/why3/Makefile (revision 408636) @@ -1,71 +1,71 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= why3 PORTVERSION= 0.83 PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://gforge.inria.fr/frs/download.php/33490/ \ http://pkgs.fedoraproject.org/repo/pkgs/why3/${FEDORA}/ MAINTAINER= ports@FreeBSD.org COMMENT= Deductive program verification platform LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICT_INSTALL= why3-gpl-* +CONFLICTS_INSTALL= why3-gpl-* BUILD_DEPENDS= ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \ lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ ocaml-sqlite3>2:${PORTSDIR}/databases/ocaml-sqlite3 \ ocaml-ocamlgraph>1.8:${PORTSDIR}/math/ocaml-ocamlgraph \ camlp5o:${PORTSDIR}/devel/ocaml-camlp5 GNU_CONFIGURE= yes INSTALL_TARGET= install-all USES= gmake USE_OCAML= yes FEDORA= ${DISTNAME}${EXTRACT_SUFX}/35f99e5f64939e50ea57f641ba2073ec ALL_TARGET= all byte CONFIGURE_ARGS= --enable-relocation \ --disable-doc \ --disable-pvs-libs \ --disable-profiling \ --disable-coq-tactic \ --disable-coq-libs \ --disable-isabelle-libs OPTIONS_DEFINE= DOCS # The pdf is pre-built, but the makefile wants to build it again in order # to generate manual.bbl which is used to build the html documention. # Regenerating pdf fails, and the dependencies are heavy. Disable this # all for now and just manually install the pdf. The "doc" target was # also removed from ALL_TARGET # #DOCS_CONFIGURE_ENABLE= doc #DOCS_BUILD_DEPENDS= rubber:${PORTSDIR}/textproc/rubber \ # hevea:${PORTSDIR}/textproc/hevea MAKE_JOBS_UNSAFE= yes post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/src/util/sysutil.ml \ ${WRKSRC}/src/jessie/Makefile.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/why3* \ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/why3/*.o \ ${STAGEDIR}${PREFIX}/lib/why3/plugins/*.cmxs \ ${STAGEDIR}${PREFIX}/lib/why3/why3-cpulimit post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${STAGEDIR}${DOCSDIR} .include