From owner-freebsd-ports Tue Jun 29 18:50: 5 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 2BFA31541B for ; Tue, 29 Jun 1999 18:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id SAA61961; Tue, 29 Jun 1999 18:50:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from news-ma.rhein-neckar.de (news-ma.rhein-neckar.de [193.197.90.3]) by hub.freebsd.org (Postfix) with ESMTP id B343F14F9A for ; Tue, 29 Jun 1999 18:44:08 -0700 (PDT) (envelope-from naddy@bigeye.rhein-neckar.de) Received: from mips.rhein-neckar.de (uucp@localhost) by news-ma.rhein-neckar.de (8.8.8/8.8.8) with bsmtp id DAA05833 for FreeBSD-gnats-submit@freebsd.org; Wed, 30 Jun 1999 03:44:07 +0200 (CEST) (envelope-from naddy@bigeye.rhein-neckar.de) Received: from bigeye.rhein-neckar.de ([193.197.90.235]) by mips.rhein-neckar.de with esmtp id m10z7nb-000WyYC (Debian Smail-3.2.0.101 1997-Dec-17 #2); Wed, 30 Jun 1999 02:00:23 +0200 (CEST) Received: (from naddy@localhost) by bigeye.rhein-neckar.de (8.9.3/8.9.3) id CAA32732; Wed, 30 Jun 1999 02:11:01 +0200 (CEST) (envelope-from naddy) Message-Id: <199906300011.CAA32732@bigeye.rhein-neckar.de> Date: Wed, 30 Jun 1999 02:11:01 +0200 (CEST) From: Christian Weisgerber Reply-To: naddy@mips.rhein-neckar.de To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/12456: graphics/xpdf: small fixes Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 12456 >Category: ports >Synopsis: graphics/xpdf: small fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 29 18:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Christian Weisgerber >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: >Description: Small fixes for the current xpdf port: * Replaced PATCH_DIST_ARGS by a simpler and cleaner PATH_DIST_STRIP line. * The xpdf port depended on Xpm, but didn't actually use it since the configure script didn't find xpm.h. Fixed by adding an explicit --with-Xpm-includes configure argument. * Included a small patch to correctly support keypad movement keys. Already accepted by Derek Noonburg for inclusion in his next release of xpdf. >How-To-Repeat: >Fix: diff -uNr /usr/ports/graphics/xpdf/Makefile xpdf/Makefile --- /usr/ports/graphics/xpdf/Makefile Wed Jun 30 00:34:33 1999 +++ xpdf/Makefile Wed Jun 30 02:00:01 1999 @@ -17,7 +17,7 @@ .if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING) PATCH_SITES= ftp://ftp.sci.usq.edu.au/pub/linux/xpdf/ PATCHFILES= xpdf-0.80-decrypt.patch -PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet +PATCH_DIST_STRIP= -p1 .endif MAINTAINER= chuckr@glue.umd.edu @@ -29,7 +29,8 @@ .endif USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gzip --enable-japanese +CONFIGURE_ARGS= --with-gzip --enable-japanese \ + --with-Xpm-includes=${X11BASE}/include CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" MAN1= pdfimages.1 \ diff -uNr /usr/ports/graphics/xpdf/patches/patch-aa xpdf/patches/patch-aa --- /usr/ports/graphics/xpdf/patches/patch-aa Thu Jan 1 01:00:00 1970 +++ xpdf/patches/patch-aa Wed Jun 30 01:59:33 1999 @@ -0,0 +1,55 @@ +--- xpdf/xpdf.cc.orig Fri Jun 18 15:22:36 1999 ++++ xpdf/xpdf.cc Fri Jun 18 15:36:02 1999 +@@ -682,11 +682,13 @@ + } else { + switch (key) { + case XK_Home: ++ case XK_KP_Home: + hScrollbar->setPos(0, canvas->getWidth()); + vScrollbar->setPos(0, canvas->getHeight()); + canvas->scroll(hScrollbar->getPos(), vScrollbar->getPos()); + break; + case XK_End: ++ case XK_KP_End: + hScrollbar->setPos(canvas->getRealWidth() - canvas->getWidth(), + canvas->getWidth()); + vScrollbar->setPos(canvas->getRealHeight() - canvas->getHeight(), +@@ -694,6 +696,7 @@ + canvas->scroll(hScrollbar->getPos(), vScrollbar->getPos()); + break; + case XK_Page_Up: ++ case XK_KP_Page_Up: + if (vScrollbar->getPos() == 0) { + prevPageCbk(NULL, 0, gTrue); + } else { +@@ -703,6 +706,7 @@ + } + break; + case XK_Page_Down: ++ case XK_KP_Page_Down: + if (vScrollbar->getPos() >= + canvas->getRealHeight() - canvas->getHeight()) { + nextPageCbk(NULL, 0, gTrue); +@@ -713,18 +717,22 @@ + } + break; + case XK_Left: ++ case XK_KP_Left: + hScrollbar->setPos(hScrollbar->getPos() - 16, canvas->getWidth()); + canvas->scroll(hScrollbar->getPos(), vScrollbar->getPos()); + break; + case XK_Right: ++ case XK_KP_Right: + hScrollbar->setPos(hScrollbar->getPos() + 16, canvas->getWidth()); + canvas->scroll(hScrollbar->getPos(), vScrollbar->getPos()); + break; + case XK_Up: ++ case XK_KP_Up: + vScrollbar->setPos(vScrollbar->getPos() - 16, canvas->getHeight()); + canvas->scroll(hScrollbar->getPos(), vScrollbar->getPos()); + break; + case XK_Down: ++ case XK_KP_Down: + vScrollbar->setPos(vScrollbar->getPos() + 16, canvas->getHeight()); + canvas->scroll(hScrollbar->getPos(), vScrollbar->getPos()); + break; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message