From owner-svn-ports-head@FreeBSD.ORG  Fri Oct 12 09:08:51 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 08AAB451;
 Fri, 12 Oct 2012 09:08:51 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id E595C8FC1D;
 Fri, 12 Oct 2012 09:08:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9C98om6074157;
 Fri, 12 Oct 2012 09:08:50 GMT (envelope-from araujo@svn.freebsd.org)
Received: (from araujo@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9C98oQD074154;
 Fri, 12 Oct 2012 09:08:50 GMT (envelope-from araujo@svn.freebsd.org)
Message-Id: <201210120908.q9C98oQD074154@svn.freebsd.org>
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Fri, 12 Oct 2012 09:08:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305766 - head/graphics/xpdf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Oct 2012 09:08:51 -0000

Author: araujo
Date: Fri Oct 12 09:08:50 2012
New Revision: 305766
URL: http://svn.freebsd.org/changeset/ports/305766

Log:
  - Fix build and use the right path of freetype2. [1]
  - Don't install xpdf on libexec when build without X support. [1]
  
  PR:		ports/169196 [1], ports/170525 [2]
  Submitted by:	Christopher <chris@imagemetrica.com> [1]
  		Rainer Duffner <rainer@ultra-secure.de> [2]
  Feature safe:	yes

Modified:
  head/graphics/xpdf/Makefile
  head/graphics/xpdf/pkg-plist

Modified: head/graphics/xpdf/Makefile
==============================================================================
--- head/graphics/xpdf/Makefile	Fri Oct 12 09:08:22 2012	(r305765)
+++ head/graphics/xpdf/Makefile	Fri Oct 12 09:08:50 2012	(r305766)
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -24,7 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-opi \
 		--with-freetype2-library="${LOCALBASE}/lib" \
-		--with-freetype2-includes="${LOCALBASE}/include/freetype2/" \
+		--with-freetype2-includes="${LOCALBASE}/include/" \
 		--bindir="${PREFIX}/libexec/xpdf"
 
 OPTIONS=	LIBPAPER "Enable libpaper"      off     \
@@ -65,7 +65,6 @@ PLIST_SUB+=		X11="@comment "
 .else
 CONFIGURE_ARGS+=	--with-x
 USE_MOTIF=		yes
-MAN1+=			xpdf.1
 PLIST_SUB+=		X11=""
 .endif
 

Modified: head/graphics/xpdf/pkg-plist
==============================================================================
--- head/graphics/xpdf/pkg-plist	Fri Oct 12 09:08:22 2012	(r305765)
+++ head/graphics/xpdf/pkg-plist	Fri Oct 12 09:08:50 2012	(r305766)
@@ -5,7 +5,6 @@ libexec/xpdf/pdfdetach
 libexec/xpdf/pdftoppm
 libexec/xpdf/pdftops
 libexec/xpdf/pdftotext
-libexec/xpdf/xpdf
 %%X11%%bin/xpdf
 etc/xpdfrc
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE