From owner-svn-ports-all@FreeBSD.ORG  Sun Oct  6 23:54:24 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 376CB324;
 Sun,  6 Oct 2013 23:54:24 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2375825CB;
 Sun,  6 Oct 2013 23:54:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96NsOUM092121;
 Sun, 6 Oct 2013 23:54:24 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96NsNb6092118;
 Sun, 6 Oct 2013 23:54:23 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201310062354.r96NsNb6092118@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Sun, 6 Oct 2013 23:54:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329645 - head/textproc/pdftohtml
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 23:54:24 -0000

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@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>