7 files changed, 51 insertions, 117 deletions

diff --git a/print/dviselect/Makefile b/print/dviselect/Makefile
index f3338608d560..eb2ea839d94e 100644
--- a/print/dviselect/Makefile
+++ b/print/dviselect/Makefile
@@ -3,20 +3,19 @@
 # Date created:         12 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1996/11/17 08:44:33 obrien Exp $
+# $Id: Makefile,v 1.10 1996/11/18 14:11:18 asami Exp $
 #
 
 DISTNAME=	dviselect
 PKGNAME=	dviselect-1.3
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/latex/software/
+MASTER_SITES=	ftp://ftp.ee.duke.edu/archives/
 
 MAINTAINER=	jmz@FreeBSD.org
 
+SCRIPTS_ENV=	CFLAGS="${CFLAGS}"
+
 MAN1=		dviselect.1
 
-pre-install:
-	@${MKDIR} ${PREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/print/dviselect/distinfo b/print/dviselect/distinfo
index 6cfc5acd32f2..8502cc8bb1ae 100644
--- a/print/dviselect/distinfo
+++ b/print/dviselect/distinfo
@@ -1 +1 @@
-MD5 (dviselect.tar.gz) = b86128095ff9570931926ada55ca532f
+MD5 (dviselect.tar.gz) = a6877bf33e421298674d8269ee9bbc2c
diff --git a/print/dviselect/files/patch-aa b/print/dviselect/files/patch-aa
index 36d026b772c4..769c72ad7541 100644
--- a/print/dviselect/files/patch-aa
+++ b/print/dviselect/files/patch-aa
@@ -1,19 +1,11 @@
-*** dviselect.c~	Tue Nov 27 08:53:14 1990
---- dviselect.c	Thu Oct  6 22:01:13 1994
-***************
-*** 122,128 ****
-  /* save some string space: we use this a lot */
-  char	writeerr[] = "error writing DVI file";
-  
-! char	*malloc(), *realloc(), *sprintf();
-  
-  /*
-   * lint gets rather confused with the current definitions of getc and putc,
---- 122,128 ----
-  /* save some string space: we use this a lot */
-  char	writeerr[] = "error writing DVI file";
-  
-! char	*malloc(), *realloc();
-  
-  /*
-   * lint gets rather confused with the current definitions of getc and putc,
+--- dviselect.c~	Thu Mar 14 21:53:21 1991
++++ dviselect.c	Tue Aug 19 18:39:09 1997
+@@ -124,8 +124,6 @@
+ 
+ #ifdef	_AIX
+ char	*malloc(), *realloc();
+-#else
+-char	*malloc(), *realloc(), *sprintf();
+ #endif
+ 
+ /*
diff --git a/print/dviselect/files/patch-ab b/print/dviselect/files/patch-ab
index 9e70371e22f4..ee0f92f6c900 100644
--- a/print/dviselect/files/patch-ab
+++ b/print/dviselect/files/patch-ab
@@ -1,40 +1,10 @@
-*** lib/error.c.orig	Mon Nov 26 23:53:19 1990
---- lib/error.c	Thu Oct  6 14:26:04 1994
-***************
-*** 16,22 ****
-   * OR _doprnt.  It should work properly under System V using vprintf.
-   * (If you have vprintf, define HAVE_VPRINTF.)
-   */
-! 
-  #include <stdio.h>
-  #include <varargs.h>
-  
---- 16,22 ----
-   * OR _doprnt.  It should work properly under System V using vprintf.
-   * (If you have vprintf, define HAVE_VPRINTF.)
-   */
-! #define HAVE_VPRINTF
-  #include <stdio.h>
-  #include <varargs.h>
-  
-***************
-*** 32,40 ****
-  
-  extern char *ProgName;
-  extern int errno;
-! extern char *sys_errlist[];
-! extern int sys_nerr;
-! 
-  error(va_alist)
-  	va_dcl
-  {
---- 32,40 ----
-  
-  extern char *ProgName;
-  extern int errno;
-! /* extern char *sys_errlist[];
-!    extern int sys_nerr;
-! */
-  error(va_alist)
-  	va_dcl
-  {
+--- lib/error.c~	Wed Nov 15 13:19:40 1989
++++ lib/error.c	Tue Aug 19 18:41:37 1997
+@@ -32,7 +32,6 @@
+ 
+ extern char *ProgName;
+ extern int errno;
+-extern char *sys_errlist[];
+ extern int sys_nerr;
+ 
+ error(va_alist)
diff --git a/print/dviselect/files/patch-ac b/print/dviselect/files/patch-ac
index aad465fe4806..1a4e3d34242f 100644
--- a/print/dviselect/files/patch-ac
+++ b/print/dviselect/files/patch-ac
@@ -1,14 +1,12 @@
-*** lib/font.c~	Tue Nov 27 08:53:20 1990
---- lib/font.c	Thu Oct  6 22:02:07 1994
-***************
-*** 67,75 ****
-   */
-  extern	int errno;
-  char	*getenv(), *malloc(), *strsave();
-- #ifndef sys5
-- char	*sprintf();
-- #endif
-  
-  static readconf();
-  static setfont();
---- 67,72 ----
+--- lib/font.c~	Thu Mar 14 21:57:06 1991
++++ lib/font.c	Tue Aug 19 18:43:47 1997
+@@ -67,9 +67,6 @@
+  */
+ extern	int errno;
+ char	*getenv(), *malloc(), *strsave();
+-#if	!(defined(sys5) || defined(_AIX))
+-char	*sprintf();
+-#endif
+ 
+ static readconf();
+ static setfont();
diff --git a/print/dviselect/files/patch-ad b/print/dviselect/files/patch-ad
index a745d9172895..05abce5e78fe 100644
--- a/print/dviselect/files/patch-ad
+++ b/print/dviselect/files/patch-ad
@@ -1,36 +1,10 @@
-*** lib/seek.c~	Mon Nov 26 23:53:23 1990
---- lib/seek.c	Thu Oct  6 14:28:14 1994
-***************
-*** 25,31 ****
-  #include <sys/file.h>
-  #include <sys/stat.h>
-  
-! long	lseek();
-  char	*getenv();
-  
-  int
---- 25,31 ----
-  #include <sys/file.h>
-  #include <sys/stat.h>
-  
-! off_t	lseek();
-  char	*getenv();
-  
-  int
-***************
-*** 33,39 ****
-  	int fd;
-  {
-  
-! 	return (lseek(fd, 0L, 1) >= 0 && !isatty(fd));
-  }
-  
-  /*
---- 33,39 ----
-  	int fd;
-  {
-  
-! 	return (lseek(fd, (off_t) 0, 1) >= 0 && !isatty(fd));
-  }
-  
-  /*
+--- lib/seek.c~	Wed Nov 15 13:19:59 1989
++++ lib/seek.c	Tue Aug 19 18:46:13 1997
+@@ -25,7 +25,6 @@
+ #include <sys/file.h>
+ #include <sys/stat.h>
+ 
+-long	lseek();
+ char	*getenv();
+ 
+ int
diff --git a/print/dviselect/scripts/configure b/print/dviselect/scripts/configure
index 08b5a6d80fbd..ac2e807e0a40 100644
--- a/print/dviselect/scripts/configure
+++ b/print/dviselect/scripts/configure
@@ -5,5 +5,6 @@ PREFIX=${PREFIX:-/usr/local}
 echo "BINDIR = $PREFIX/bin"     >> $WRKSRC/Makefile || exit 1;
 echo "MANDIR = $PREFIX/man"     >> $WRKSRC/Makefile || exit 1;
 echo "all: default"             >> $WRKSRC/Makefile || exit 1;
-echo "install: inst-dviselect"  >> $WRKSRC/Makefile || exit 1;
-exit 0;
\ No newline at end of file
+echo "CFLAGS= $CFLAGS -I../h -I./h -DHAVE_VPRINTF" >> $WRKSRC/Makefile || exit 1;
+echo "MFLAGS=CFLAGS=\"\${CFLAGS}\""   >> $WRKSRC/Makefile || exit 1;
+exit 0;