diff --git a/math/libxls/Makefile b/math/libxls/Makefile index 50775156c8f9..7e7d2add3b0f 100644 --- a/math/libxls/Makefile +++ b/math/libxls/Makefile @@ -1,19 +1,21 @@ PORTNAME= libxls PORTVERSION= 1.6.2 CATEGORIES= math devel MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/ MAINTAINER= bapt@FreeBSD.org COMMENT= Extract Cell Data From Excel xls files WWW= https://github.com/libxls/libxls LICENSE= BSD2CLAUSE -USES= compiler:c++11-lang cpe libtool +USES= compiler:c++11-lang cpe libtool CPE_VENDOR= ${PORTNAME}_project +CONFLICTS_INSTALL= catdoc + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes .include diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile index 1467ceb509fc..e593a403a661 100644 --- a/textproc/catdoc/Makefile +++ b/textproc/catdoc/Makefile @@ -1,42 +1,44 @@ PORTNAME= catdoc PORTVERSION= 0.95 CATEGORIES= textproc MASTER_SITES= http://ftp.wagner.pp.ru/pub/catdoc/ \ - http://mirror.amdmi3.ru/distfiles/ + https://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= MS Word/Excel converter to plain ASCII or TeX. TK viewer included WWW= https://www.wagner.pp.ru/~vitus/software/catdoc/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +USES= cpe gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-install-root="${STAGEDIR}" -USES= cpe gmake CPE_VENDOR= fossies +CONFLICTS_INSTALL= libxls + PORTDATA= * OPTIONS_DEFINE= WORDVIEW OPTIONS_DEFAULT=WORDVIEW OPTIONS_SUB= yes WORDVIEW_DESC= Build Tcl/Tk document viewer WORDVIEW_USES= tk WORDVIEW_CONFIGURE_ON= --with-wish=${WISH} WORDVIEW_CONFIGURE_OFF= --disable-wordview .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R # Remove the below line to get Cyrillic code page support instead CFLAGS+= -DLATIN1=1 .endif post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/doc/catdoc.1.in post-install: cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} catdoc catppt xls2csv .include