Index: head/devel/libosmo-sccp/Makefile =================================================================== --- head/devel/libosmo-sccp/Makefile (revision 379763) +++ head/devel/libosmo-sccp/Makefile (revision 379764) @@ -1,31 +1,33 @@ # $FreeBSD$ PORTNAME= libosmo-sccp PORTVERSION= 0.0.6.3 PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://chaosophia.net/downloads/osmocom/${PORTNAME}/ \ http://ns1.chaosophia.net/downloads/osmocom/${PORTNAME}/ MAINTAINER= koue@chaosophia.net COMMENT= SCCP network layer protocol implementation LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libosmocore.so:${PORTSDIR}/devel/libosmocore +CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a + USES= autoreconf gmake pathfix pkgconfig PATHFIX_MAKEFILEIN=Makefile.am GNU_CONFIGURE= yes post-patch: ${REINPLACE_CMD} -e 's,endian\.h,sys/endian.h,' \ -e 's,__BYTE_ORDER,BYTE_ORDER,' \ -e 's,__LITTLE_ENDIAN,LITTLE_ENDIAN,' \ -e 's,__BIG_ENDIAN,BIG_ENDIAN,' \ ${WRKSRC}/include/mtp/mtp_level3.h \ ${WRKSRC}/include/sccp/sccp_types.h ${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version .include Index: head/multimedia/libmtp/Makefile =================================================================== --- head/multimedia/libmtp/Makefile (revision 379763) +++ head/multimedia/libmtp/Makefile (revision 379764) @@ -1,50 +1,52 @@ # Created by: Petar Zhivkov Petrov # $FreeBSD$ PORTNAME= libmtp PORTVERSION= 1.1.8 PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Media Transfer Protocol (MTP) library LICENSE= LGPL21 # or any later version +CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a + OPTIONS_DEFINE= MTPZ OPTIONS_DEFAULT= MTPZ MTPZ_DESC= Enable functionality to connect to MTPZ devices GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen INSTALL_TARGET= install-strip USES= iconv libtool pathfix pkgconfig USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) CONFIGURE_ENV+= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" .endif MTPZ_CONFIGURE_ENABLE= mtpz MTPZ_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt post-patch: .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) @${REINPLACE_CMD} -e \ '/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '/Libs.private/s|:|& @LIBUSB_LIBS@|' ${WRKSRC}/libmtp.pc.in .endif @${REINPLACE_CMD} -e \ '/if test/s|==|=| ; \ /endian.h/s|machine|sys|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|Requires|&.private|' ${WRKSRC}/libmtp.pc.in @${REINPLACE_CMD} -e \ 's|__builtin_bswap|bswap|g' ${WRKSRC}/src/mtpz.c .include