svn commit: r329645 - head/textproc/pdftohtml

[John Marino]

Author: marino
Date: Sun Oct  6 23:54:23 2013
New Revision: 329645
URL: http://svnweb.freebsd.org/changeset/ports/329645

Log:
  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.

Modified:
  head/textproc/pdftohtml/Makefile

Modified: head/textproc/pdftohtml/Makefile
==============================================================================
--- head/textproc/pdftohtml/Makefile	Sun Oct  6 23:52:26 2013	(r329644)
+++ head/textproc/pdftohtml/Makefile	Sun Oct  6 23:54:23 2013	(r329645)
@@ -3,19 +3,17 @@
 
 PORTNAME=	pdftohtml
 PORTVERSION=	0.39
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports at 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 <bsd.port.mk>