From 41b58dcf971fe2a3c036d49df3413db4d33de69a Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 6 Oct 2013 23:54:23 +0000 Subject: textproc/pdftohtml: Resolve conflict with poppler-utils The conflict between this unmaintained port and poppler-utils can be problematic. Ports should be using poppler-utils rather than this one as a build dependency. This port's package list is 1-line long, so lets just rename the program so that it can coexist with the version from poppler-utils. The name changes from "pdftohtml" to "pdf-to-html" along with a PORTREVISION bump. Minor cleanup to pet portlint was alson done. --- textproc/pdftohtml/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'textproc/pdftohtml') diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile index 0802df6890a4..2f11926bdf21 100644 --- a/textproc/pdftohtml/Makefile +++ b/textproc/pdftohtml/Makefile @@ -3,19 +3,17 @@ PORTNAME= pdftohtml PORTVERSION= 0.39 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A command-line tool for converting pdf-files into html - -CONFLICTS= poppler-utils-[0-9]* +COMMENT= Command-line tool for converting pdf-files into html +USES= gmake USE_GHOSTSCRIPT_RUN= yes -USE_GMAKE= yes -PLIST_FILES= bin/pdftohtml +PLIST_FILES= bin/pdf-to-html WRKSRC= ${WRKDIR}/${DISTNAME} @@ -25,6 +23,6 @@ pre-patch: ${REINPLACE_CMD} -e "s|-O[0-9]||" -e "s|-g||" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/pdftohtml ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/pdftohtml ${PREFIX}/bin/pdf-to-html .include -- cgit v1.2.3