From vanilla@Minje.Com.TW  Thu May 29 12:42:56 1997
Received: from Minje.Com.TW (vanilla@ns.minje.com.tw [210.66.86.1])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA04814
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 May 1997 12:42:50 -0700 (PDT)
Received: (from vanilla@localhost)
          by Minje.Com.TW (8.8.5/Vanilla)
	  id DAA15555; Fri, 30 May 1997 03:40:47 +0800 (CST)
Message-Id: <199705291940.DAA15555@Minje.Com.TW>
Date: Fri, 30 May 1997 03:40:47 +0800 (CST)
From: vanilla@Minje.Com.TW
Reply-To: vanilla@Minje.Com.TW
To: FreeBSD-gnats-submit@freebsd.org
Subject: xpdf 0.7 ports 
X-Send-Pr-Version: 3.2

>Number:         3712
>Category:       ports
>Synopsis:       xpdf 0.7 ports
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:
>Keywords:
>Date-Required:
>Class:          support
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 29 12:50:00 PDT 1997
>Closed-Date:    Tue Jun 3 00:15:55 PDT 1997
>Last-Modified:  Tue Jun  3 00:17:59 PDT 1997
>Originator:     Vanill Ice
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
Cray running FreeBSD
>Environment:


>Description:

		xpdf 0.7 ports

>How-To-Repeat:

>Fix:
	
diff -bcrNp xpdf.orig/Makefile xpdf/Makefile
*** xpdf.orig/Makefile	Sat Apr  5 22:58:39 1997
--- xpdf/Makefile	Fri May 30 03:32:39 1997
***************
*** 1,18 ****
  # New ports collection makefile for:	xpdf
! # Version required:     0.6
  # Date created:         02 Feb 1996
  # Whom:                 chuckr@glue.umd.edu
  #
  # $Id: Makefile,v 1.9 1997/03/21 23:07:01 asami Exp $
  #
  
! DISTNAME=       xpdf-0.6
  CATEGORIES=	graphics print
  MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/xpdf/
  
  MAINTAINER=	chuckr@glue.umd.edu
  
  USE_X11=	yes
! MAN1=		xpdf.1 pdftops.1
  
  .include <bsd.port.mk>
--- 1,18 ----
  # New ports collection makefile for:	xpdf
! # Version required:     0.7
  # Date created:         02 Feb 1996
  # Whom:                 chuckr@glue.umd.edu
  #
  # $Id: Makefile,v 1.9 1997/03/21 23:07:01 asami Exp $
  #
  
! DISTNAME=       xpdf-0.7
  CATEGORIES=	graphics print
  MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/xpdf/
  
  MAINTAINER=	chuckr@glue.umd.edu
  
  USE_X11=	yes
! MAN1=		xpdf.1 pdftops.1 pdftotext.1
  
  .include <bsd.port.mk>
diff -bcrNp xpdf.orig/files/md5 xpdf/files/md5
*** xpdf.orig/files/md5	Sat Apr  5 22:56:15 1997
--- xpdf/files/md5	Fri May 30 03:27:07 1997
***************
*** 1 ****
! MD5 (xpdf-0.6.tar.gz) = a55656a65f937bbf069723035e1bcf35
--- 1 ----
! MD5 (xpdf-0.7.tar.gz) = a871cade04c8c9e55ff7e45c5ff49b4b
diff -bcrNp xpdf.orig/patches/patch-aa xpdf/patches/patch-aa
*** xpdf.orig/patches/patch-aa	Sat Apr  5 22:56:15 1997
--- xpdf/patches/patch-aa	Fri May 30 03:36:22 1997
***************
*** 1,25 ****
! *** Makefile.orig	Fri Nov 29 21:16:32 1996
! --- Makefile	Fri Nov 29 21:19:22 1996
! ***************
! *** 21,30 ****
!   	cd xpdf; $(MAKE) pdftops
    
    install:
! ! 	install -c xpdf/xpdf $(PREFIX)/bin
! ! 	install -c xpdf/pdftops $(PREFIX)/bin
! ! 	install -c xpdf.1 $(PREFIX)/man/man1
! ! 	install -c pdftops.1 $(PREFIX)/man/man1
    
    clean:
    	cd goo; $(MAKE) clean
! --- 21,30 ----
!   	cd xpdf; $(MAKE) pdftops
    
    install:
! ! 	install -c xpdf/xpdf $(X11BASE)/bin
! ! 	install -c xpdf/pdftops $(X11BASE)/bin
! ! 	install -c xpdf.1 $(X11BASE)/man/man1
! ! 	install -c pdftops.1 $(X11BASE)/man/man1
    
    clean:
    	cd goo; $(MAKE) clean
--- 1,29 ----
! *** Makefile.orig	Fri May 30 03:27:24 1997
! --- Makefile	Fri May 30 03:28:56 1997
! *************** pdftotext: dummy
! *** 27,38 ****
!   	cd xpdf; $(MAKE) pdftotext$(EXE)
    
    install:
! ! 	$(INSTALL) xpdf/xpdf$(EXE) $(PREFIX)/bin
! ! 	$(INSTALL) xpdf/pdftops$(EXE) $(PREFIX)/bin
! ! 	$(INSTALL) xpdf/pdftotext$(EXE) $(PREFIX)/bin
! ! 	$(INSTALL) xpdf.1 $(PREFIX)/man/man1
! ! 	$(INSTALL) pdftops.1 $(PREFIX)/man/man1
! ! 	$(INSTALL) pdftotext.1 $(PREFIX)/man/man1
    
    clean:
    	cd goo; $(MAKE) clean
! --- 27,38 ----
!   	cd xpdf; $(MAKE) pdftotext$(EXE)
    
    install:
! ! 	$(INSTALL) xpdf/xpdf$(EXE) $(X11BASE)/bin
! ! 	$(INSTALL) xpdf/pdftops$(EXE) $(X11BASE)/bin
! ! 	$(INSTALL) xpdf/pdftotext$(EXE) $(X11BASE)/bin
! ! 	$(INSTALL) xpdf.1 $(X11BASE)/man/man1
! ! 	$(INSTALL) pdftops.1 $(X11BASE)/man/man1
! ! 	$(INSTALL) pdftotext.1 $(X11BASE)/man/man1
    
    clean:
    	cd goo; $(MAKE) clean
diff -bcrNp xpdf.orig/patches/patch-ab xpdf/patches/patch-ab
*** xpdf.orig/patches/patch-ab	Sat Apr  5 22:56:15 1997
--- xpdf/patches/patch-ab	Fri May 30 03:31:48 1997
***************
*** 1,24 ****
! *** Makefile.config.orig	Fri Nov 29 21:19:49 1996
! --- Makefile.config	Fri Nov 29 21:23:24 1996
  ***************
! *** 94,100 ****
!   #CFLAGS2 = -O2 -Wall
    
    # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
! ! CFLAGS2 = -O2 -Wall -Wno-unused
    
    # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
    #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
! --- 94,100 ----
!   #CFLAGS2 = -O2 -Wall
    
    # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
! ! CFLAGS2 = -O2 -Wall -Wno-unused -I${X11BASE}/include
    
    # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
    #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
! ***************
! *** 127,139 ****
    #------------------------------------------------------------------------
    
    # For most systems, just grab the X library:
--- 1,41 ----
! *** Makefile.config.orig	Fri May 30 03:29:08 1997
! --- Makefile.config	Fri May 30 03:31:38 1997
  ***************
! *** 44,50 ****
!   #------------------------------------------------------------------------
!   
!   # Binaries and man pages will be installed here:
! ! PREFIX = /usr/local
!   
!   # SCO puts stuff here:
!   #PREFIX = /u
! --- 44,50 ----
!   #------------------------------------------------------------------------
!   
!   # Binaries and man pages will be installed here:
! ! PREFIX = /usr/X11R6
!   
!   # SCO puts stuff here:
!   #PREFIX = /u
! *************** EXE =
! *** 149,155 ****
!   #CFLAGS2 = -O2 -Wall -DNO_XPM
    
    # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
! ! CFLAGS2 = -O2 -Wall -Wno-unused -DNO_XPM
    
    # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
    #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
! --- 149,155 ----
!   #CFLAGS2 = -O2 -Wall -DNO_XPM
    
    # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
! ! CFLAGS2 = -O2 -m486 -pipe -Wall -Wno-unused -I${X11BASE}/include
    
    # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
    #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
! *************** CXXFLAGS2 = $(CFLAGS2)
! *** 197,209 ****
    #------------------------------------------------------------------------
    
    # For most systems, just grab the X library:
***************
*** 32,38 ****
    
    # Some BSDI systems may need -lipc (?):
    #XLIBS = -L/usr/X11R6/lib -lX11 -lipc
! --- 127,139 ----
    #------------------------------------------------------------------------
    
    # For most systems, just grab the X library:
--- 49,55 ----
    
    # Some BSDI systems may need -lipc (?):
    #XLIBS = -L/usr/X11R6/lib -lX11 -lipc
! --- 197,209 ----
    #------------------------------------------------------------------------
    
    # For most systems, just grab the X library:
***************
*** 46,48 ****
--- 63,88 ----
    
    # Some BSDI systems may need -lipc (?):
    #XLIBS = -L/usr/X11R6/lib -lX11 -lipc
+ *************** XLIBS = -lX11
+ *** 242,251 ****
+   #------------------------------------------------------------------------
+   
+   # This is needed for the color icon:
+ ! #XPMLIB = -lXpm
+   
+   # Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2):
+ ! XPMLIB =
+   
+   #------------------------------------------------------------------------
+   # C++ compilation rule.
+ --- 242,251 ----
+   #------------------------------------------------------------------------
+   
+   # This is needed for the color icon:
+ ! XPMLIB = -lXpm
+   
+   # Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2):
+ ! #XPMLIB =
+   
+   #------------------------------------------------------------------------
+   # C++ compilation rule.
diff -bcrNp xpdf.orig/pkg/PLIST xpdf/pkg/PLIST
*** xpdf.orig/pkg/PLIST	Sat Apr  5 22:56:15 1997
--- xpdf/pkg/PLIST	Fri May 30 03:33:01 1997
***************
*** 1,4 ****
--- 1,6 ----
  bin/xpdf
  bin/pdftops
+ bin/pdftotext
  man/man1/xpdf.1.gz
  man/man1/pdftops.1.gz
+ man/man1/pdftotext.1.gz

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: asami 
State-Changed-When: Tue Jun 3 00:15:55 PDT 1997 
State-Changed-Why:  

Committed, thanks!  By the way, I removed patch-aa altogether, 
the change from ${PREFIX} to ${X11BASE} is meaningless since they 
are the same if USE_X11 is defined.  Also, I changed "PREFIX=" to 
"PREFIX?=" in Makefile.config, it is passed in from the environment 
during a regular build so "?=" would suffice (for people who are 
debugging the port and types "make" inside the work directory, for 
>Unformatted:
