From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 1 22:50:04 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5CFB16A41F for ; Thu, 1 Dec 2005 22:50:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1907E43D62 for ; Thu, 1 Dec 2005 22:50:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jB1Mo21U093420 for ; Thu, 1 Dec 2005 22:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jB1Mo2bt093390; Thu, 1 Dec 2005 22:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 1 Dec 2005 22:50:02 GMT Resent-Message-Id: <200512012250.jB1Mo2bt093390@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D0F216A41F for ; Thu, 1 Dec 2005 22:49:37 +0000 (GMT) (envelope-from rebum@mail.vx.sk) Received: from mail.vx.sk (de.vx.sk [217.20.112.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C8E043D45 for ; Thu, 1 Dec 2005 22:49:36 +0000 (GMT) (envelope-from rebum@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id BA98022A14 for ; Thu, 1 Dec 2005 23:49:34 +0100 (CET) Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 87740-01 for ; Thu, 1 Dec 2005 23:49:33 +0100 (CET) Received: by mail.vx.sk (Postfix, from userid 1001) id AB38722A0D; Thu, 1 Dec 2005 23:49:33 +0100 (CET) Message-Id: <20051201224933.AB38722A0D@mail.vx.sk> Date: Thu, 1 Dec 2005 23:49:33 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89822: [PATCH] WITHOUT_X11 support for graphics/xpdf X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Matuska List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2005 22:50:04 -0000 >Number: 89822 >Category: ports >Synopsis: [PATCH] WITHOUT_X11 support for graphics/xpdf >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 01 22:50:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 6.0-RELEASE >Organization: >Environment: FreeBSD 6.0-RELEASE i386 amd64 >Description: The xpdf toolset does not require X libraries installed. (only the xpdf and pdftoppm binaries are not built) pdftoppm compiles with freetype2 only, too. So patch patchfiles enable build for pdftoppm. >How-To-Repeat: >Fix: diff -Nbur graphics/xpdf.orig/Makefile graphics/xpdf/Makefile --- graphics/xpdf.orig/Makefile Thu Dec 1 17:19:39 2005 +++ graphics/xpdf/Makefile Thu Dec 1 17:25:52 2005 @@ -21,15 +21,12 @@ freetype.9:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts -USE_X_PREFIX= yes -USE_MOTIF= yes - USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gzip --enable-opi --with-x \ +CONFIGURE_ARGS= --with-gzip --enable-opi \ --with-t1-library="${LOCALBASE}/lib" \ --with-t1-includes="${LOCALBASE}/include" \ --with-freetype2-library="${LOCALBASE}/lib" \ @@ -43,9 +40,20 @@ pdfinfo.1 \ pdftoppm.1 \ pdftops.1 \ - pdftotext.1 \ - xpdf.1 + pdftotext.1 MAN5= xpdfrc.5 + +.if defined(WITHOUT_X11) +PKGNAMESUFFIX+= -nox11 +CONFIGURE_ARGS+= --without-x +PLIST_SUB+= X11='@comment ' +.else +CONFIGURE_ARGS+= --with-x +USE_X_PREFIX= yes +USE_MOTIF= yes +MAN1+= xpdf.1 +PLIST_SUB+= X11='' +.endif post-install: .if !defined(NOPORTDOCS) diff -Nbur graphics/xpdf.orig/distinfo graphics/xpdf/distinfo --- graphics/xpdf.orig/distinfo Thu Dec 1 17:19:39 2005 +++ graphics/xpdf/distinfo Thu Dec 1 17:35:48 2005 @@ -1,2 +1,3 @@ MD5 (xpdf-3.01.tar.gz) = e004c69c7dddef165d768b1362b44268 +SHA256 (xpdf-3.01.tar.gz) = 7aedfb8cd113b868277c3d894633dd6e0f5a8ed28af12f5d883ae4ed98e9f789 SIZE (xpdf-3.01.tar.gz) = 599778 diff -Nbur graphics/xpdf.orig/files/patch-Makefile.in graphics/xpdf/files/patch-Makefile.in --- graphics/xpdf.orig/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ graphics/xpdf/files/patch-Makefile.in Thu Dec 1 17:18:33 2005 @@ -0,0 +1,20 @@ +--- Makefile.in.orig Thu Dec 1 17:04:10 2005 ++++ Makefile.in Thu Dec 1 17:04:31 2005 +@@ -82,7 +82,7 @@ + $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) + $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) + $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) +-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) ++ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) + $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) + -mkdir -p $(DESTDIR)@mandir@/man1 + @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1 +@@ -90,7 +90,7 @@ + $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 + $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 + $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 +-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 ++ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 + $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 + -mkdir -p $(DESTDIR)@mandir@/man5 + $(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5 diff -Nbur graphics/xpdf.orig/files/patch-configure graphics/xpdf/files/patch-configure --- graphics/xpdf.orig/files/patch-configure Thu Jan 1 01:00:00 1970 +++ graphics/xpdf/files/patch-configure Thu Dec 1 17:18:33 2005 @@ -0,0 +1,15 @@ +--- configure.orig Thu Dec 1 17:06:03 2005 ++++ configure Thu Dec 1 17:06:25 2005 +@@ -11776,8 +11776,8 @@ + { echo "$as_me:$LINENO: WARNING: Couldn't find FreeType" >&5 + echo "$as_me: WARNING: Couldn't find FreeType" >&2;}; + fi +- { echo "$as_me:$LINENO: WARNING: -- You will be able to compile pdftops, pdftotext, +- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm" >&5 +-echo "$as_me: WARNING: -- You will be able to compile pdftops, pdftotext, +- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm" >&2;} ++ { echo "$as_me:$LINENO: WARNING: -- You will be able to compile pdftoppm, pdftops, pdftotext, ++ pdfinfo, pdffonts, and pdfimages, but not xpdf" >&5 ++echo "$as_me: WARNING: -- You will be able to compile pdftoppm, pdftops, pdftotext, ++ pdfinfo, pdffonts, and pdfimages, but not xpdf" >&2;} + fi diff -Nbur graphics/xpdf.orig/files/patch-configure.in graphics/xpdf/files/patch-configure.in --- graphics/xpdf.orig/files/patch-configure.in Thu Jan 1 01:00:00 1970 +++ graphics/xpdf/files/patch-configure.in Thu Dec 1 17:18:33 2005 @@ -0,0 +1,11 @@ +--- configure.in.orig Thu Dec 1 17:05:11 2005 ++++ configure.in Thu Dec 1 17:05:25 2005 +@@ -341,6 +341,6 @@ + if test "x$smr_have_freetype2_library" != xyes; then + AC_MSG_WARN([Couldn't find FreeType]); + fi +- AC_MSG_WARN([-- You will be able to compile pdftops, pdftotext, +- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm]) ++ AC_MSG_WARN([-- You will be able to compile pdftoppm, pdftops, pdftotext, ++ pdfinfo, pdffonts, and pdfimages, but not xpdf]) + fi diff -Nbur graphics/xpdf.orig/files/patch-xpdf::Makefile.in graphics/xpdf/files/patch-xpdf::Makefile.in --- graphics/xpdf.orig/files/patch-xpdf::Makefile.in Thu Jan 1 01:00:00 1970 +++ graphics/xpdf/files/patch-xpdf::Makefile.in Thu Dec 1 17:18:33 2005 @@ -0,0 +1,11 @@ +--- xpdf/Makefile.in.orig Thu Dec 1 17:10:20 2005 ++++ xpdf/Makefile.in Thu Dec 1 17:10:34 2005 +@@ -109,7 +109,7 @@ + pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) + + all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ +- pdfimages$(EXE) ++ pdftoppm$(EXE) pdfimages$(EXE) + + #------------------------------------------------------------------------ + diff -Nbur graphics/xpdf.orig/pkg-plist graphics/xpdf/pkg-plist --- graphics/xpdf.orig/pkg-plist Thu Dec 1 17:19:39 2005 +++ graphics/xpdf/pkg-plist Thu Dec 1 17:18:33 2005 @@ -4,7 +4,7 @@ bin/pdftoppm bin/pdftops bin/pdftotext -bin/xpdf +%%X11%%bin/xpdf etc/xpdfrc %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE %%PORTDOCS%%%%DOCSDIR%%/CHANGES >Release-Note: >Audit-Trail: >Unformatted: