diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index 7ff6ebea447..b100d8acc39 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -1,16 +1,10 @@
-# OpenBSD makefile for:	bibview
-# Version required:	1.5
-# Date created:		May 17 1998
-# Whom:			Angelos D. Keromytis
-#
-# $OpenBSD: Makefile,v 1.10 2000/10/22 15:43:15 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.11 2001/04/17 13:13:25 naddy Exp $
+
+COMMENT=	"GUI for manipulating BibTeX bibliography databases"
 
 DISTNAME=	bibview-2.2
 CATEGORIES=	databases print
-NEED_VERSION=	1.305
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
+NEED_VERSION=	1.363
 
 MAINTAINER=	ports@openbsd.org
 
@@ -19,7 +13,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=		${MASTER_SITE_TEX_CTAN}
+MASTER_SITE_SUBDIR=	biblio/bibtex/utils/bibview-2.0
+
 CONFIGURE_STYLE=imake
 WRKDIST=	${WRKDIR}/bibview-2.2
+USE_X11=	Yes
 
 .include <bsd.port.mk>
diff --git a/print/bibview/patches/patch-ah b/print/bibview/patches/patch-ComboBo_h
similarity index 65%
rename from print/bibview/patches/patch-ah
rename to print/bibview/patches/patch-ComboBo_h
index 21f1cbd5303..c7ce30bfbaa 100644
--- a/print/bibview/patches/patch-ah
+++ b/print/bibview/patches/patch-ComboBo_h
@@ -1,5 +1,6 @@
---- ComboBo.h.orig	Thu Nov 25 08:11:05 1993
-+++ ComboBo.h	Tue Sep 23 20:03:24 1997
+$OpenBSD: patch-ComboBo_h,v 1.1 2001/04/17 13:13:26 naddy Exp $
+--- ComboBo.h.orig	Thu Nov 25 14:11:05 1993
++++ ComboBo.h	Tue Apr 17 14:30:50 2001
 @@ -23,7 +23,9 @@
  
  #define XtNselectCallback "selectCallback"
diff --git a/print/bibview/patches/patch-ac b/print/bibview/patches/patch-FileNom_c
similarity index 82%
rename from print/bibview/patches/patch-ac
rename to print/bibview/patches/patch-FileNom_c
index 45ec9e37942..9207592126f 100644
--- a/print/bibview/patches/patch-ac
+++ b/print/bibview/patches/patch-FileNom_c
@@ -1,6 +1,7 @@
+$OpenBSD: patch-FileNom_c,v 1.1 2001/04/17 13:13:26 naddy Exp $
 --- FileNom.c.orig	Thu May  4 18:15:11 1995
-+++ FileNom.c	Thu Sep 11 13:08:28 1997
-@@ -822,20 +822,20 @@
++++ FileNom.c	Tue Apr 17 14:30:50 2001
+@@ -822,20 +822,20 @@ FillWindow(fnw)
      Dimension height, internalHeight, rowSpacing;
      int num, newNum, idx;
      struct dirent  **namelist;
@@ -26,7 +27,7 @@
      /* Read the directory `CurrentDir(fnw)'
         and set the `dirent's in `namelist'. */
         dirp = opendir( CurrentDir(fnw) );
-@@ -860,7 +860,7 @@
+@@ -860,7 +860,7 @@ FillWindow(fnw)
  
      /* Sort the directory entries in `namelist'. */
         qsort( namelist, num, sizeof(struct dirent*), direntpcmp );
diff --git a/print/bibview/patches/patch-ag b/print/bibview/patches/patch-FileNom_h
similarity index 65%
rename from print/bibview/patches/patch-ag
rename to print/bibview/patches/patch-FileNom_h
index 1c302aa34af..6e1d1f5589e 100644
--- a/print/bibview/patches/patch-ag
+++ b/print/bibview/patches/patch-FileNom_h
@@ -1,5 +1,6 @@
---- FileNom.h.orig	Thu Nov 25 08:11:06 1993
-+++ FileNom.h	Tue Sep 23 20:03:16 1997
+$OpenBSD: patch-FileNom_h,v 1.1 2001/04/17 13:13:26 naddy Exp $
+--- FileNom.h.orig	Thu Nov 25 14:11:06 1993
++++ FileNom.h	Tue Apr 17 14:30:50 2001
 @@ -52,7 +52,9 @@
  
  #define XtNselectCallback "selectCallback"
diff --git a/print/bibview/patches/patch-Imakefile b/print/bibview/patches/patch-Imakefile
new file mode 100644
index 00000000000..657ecc11f49
--- /dev/null
+++ b/print/bibview/patches/patch-Imakefile
@@ -0,0 +1,22 @@
+$OpenBSD: patch-Imakefile,v 1.1 2001/04/17 13:13:26 naddy Exp $
+--- Imakefile.orig	Mon Feb 27 14:41:19 1995
++++ Imakefile	Tue Apr 17 14:36:49 2001
+@@ -9,7 +9,6 @@
+ 
+ 
+ /* nothing needs to be modified below this point */
+-CFLAGS = $(STD_CPP_DEFINES)
+ #ifdef NeXTArchitecture
+ 
+ SYS_LIBRARIES = XawClientLibs -lm -lsys_s
+@@ -30,10 +29,6 @@ CDEBUGFLAGS =
+ CCOPTIONS = -float -Wf,-XNl3000
+ PROTO_DEFINES =
+ CC = cc
+-
+-#else /* Others */              /* END SGIArchitecture */
+-
+-CC = gcc -fstrength-reduce -fpcc-struct-return
+ 
+ #endif                         
+ #endif 
diff --git a/print/bibview/patches/patch-aa b/print/bibview/patches/patch-aa
deleted file mode 100644
index 58954c920bf..00000000000
--- a/print/bibview/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Imakefile.orig	Mon Feb 27 14:41:19 1995
-+++ Imakefile	Thu Sep 11 13:08:27 1997
-@@ -9,7 +9,7 @@
- 
- 
- /* nothing needs to be modified below this point */
--CFLAGS = $(STD_CPP_DEFINES)
-+CFLAGS = $(STD_CPP_DEFINES) -I/usr/X11R6/include
- #ifdef NeXTArchitecture
- 
- SYS_LIBRARIES = XawClientLibs -lm -lsys_s
diff --git a/print/bibview/patches/patch-ai b/print/bibview/patches/patch-ai
deleted file mode 100644
index 5be37ce8600..00000000000
--- a/print/bibview/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-*** ctl_open.c.orig	Sun May 17 01:13:56 1998
---- ctl_open.c	Sun May 17 01:18:00 1998
-***************
-*** 112,120 ****
-     bp->tempfile = (char *)XtMalloc(strlen(tempName)+1);
-     strcpy(bp->tempfile,tempName);
-  #else
-!    bp->tempfile = (char *)tempnam(NULL, NULL);
-  #endif
-!    tempFile = fopen(bp->tempfile, "w" );
-     fclose(tempFile);
-  
-     /* display window for bib */
---- 112,120 ----
-     bp->tempfile = (char *)XtMalloc(strlen(tempName)+1);
-     strcpy(bp->tempfile,tempName);
-  #else
-!    bp->tempfile = strdup("/tmp/aa.XXXXXXXX");
-  #endif
-!    tempFile = fdopen(mkstemp(bp->tempfile), "w" );
-     fclose(tempFile);
-  
-     /* display window for bib */
diff --git a/print/bibview/patches/patch-aj b/print/bibview/patches/patch-aj
deleted file mode 100644
index f1cd0863ab6..00000000000
--- a/print/bibview/patches/patch-aj
+++ /dev/null
@@ -1,27 +0,0 @@
-*** ctl_serv.c.orig	Sun May 17 01:16:44 1998
---- ctl_serv.c	Sun May 17 01:17:47 1998
-***************
-*** 307,317 ****
-        bp->macrofile = (char *)XtMalloc(strlen(tempName)+1);
-        strcpy(bp->macrofile,tempName);
-  #else
-!       bp->macrofile = (char *)tempnam(NULL, NULL);
-  #endif
-        if (bp->macrofile == NULL)
-  	 return(ERR_NOMALLOC);
-!       if ((fh = creat(bp->macrofile, 0700)) == -1)
-  	 return(ERR_NO_OPEN_TMP);
-        close(fh);
-     }
---- 307,317 ----
-        bp->macrofile = (char *)XtMalloc(strlen(tempName)+1);
-        strcpy(bp->macrofile,tempName);
-  #else
-!       bp->macrofile = strdup("/tmp/aa.XXXXXXXX");
-  #endif
-        if (bp->macrofile == NULL)
-  	 return(ERR_NOMALLOC);
-!       if ((fh = mkstemp(bp->macrofile)) == -1)
-  	 return(ERR_NO_OPEN_TMP);
-        close(fh);
-     }
diff --git a/print/bibview/patches/patch-ak b/print/bibview/patches/patch-ak
deleted file mode 100644
index d9f9bb955fc..00000000000
--- a/print/bibview/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-*** bib_file.c.orig	Sun May 17 01:18:11 1998
---- bib_file.c	Sun May 17 01:19:53 1998
-***************
-*** 467,475 ****
-    strcpy(bp->macrofile,tempName);
-  #else
-!   bp->tempfile = (char *)tempnam(NULL, NULL);
-!   bp->macrofile = (char *)tempnam(NULL, NULL);
-  #endif
-!   tempDatei = fopen(bp->macrofile, "w" );
-  
-    if ((erg = SetInputFile(bp->filepath)) == BIF_ENOTEXISTS){
-       glbbp = bp;
---- 467,475 ----
-    strcpy(bp->macrofile,tempName);
-  #else
-!   bp->tempfile = strdup("/tmp/ax.XXXXXXXX"); close(mkstemp(bp->tempfile));
-!   bp->macrofile = strdup("/tmp/ww.XXXXXXXX");
-  #endif
-!   tempDatei = fdopen(mkstemp(bp->macrofile), "w" );
-  
-    if ((erg = SetInputFile(bp->filepath)) == BIF_ENOTEXISTS){
-       glbbp = bp;
diff --git a/print/bibview/patches/patch-bib_file_c b/print/bibview/patches/patch-bib_file_c
new file mode 100644
index 00000000000..b8f2502a00b
--- /dev/null
+++ b/print/bibview/patches/patch-bib_file_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-bib_file_c,v 1.1 2001/04/17 13:13:30 naddy Exp $
+--- bib_file.c.orig	Thu May  4 18:19:36 1995
++++ bib_file.c	Tue Apr 17 14:30:51 2001
+@@ -466,10 +466,10 @@ Errcode bifFileRead(BibPtr bp)
+   bp->macrofile = (char *)XtMalloc(strlen(tempName)+1);
+   strcpy(bp->macrofile,tempName);
+ #else
+-  bp->tempfile = (char *)tempnam(NULL, NULL);
+-  bp->macrofile = (char *)tempnam(NULL, NULL);
++  bp->tempfile = strdup("/tmp/ax.XXXXXXXX"); close(mkstemp(bp->tempfile));
++  bp->macrofile = strdup("/tmp/ww.XXXXXXXX");
+ #endif
+-  tempDatei = fopen(bp->macrofile, "w" );
++  tempDatei = fdopen(mkstemp(bp->macrofile), "w" );
+ 
+   if ((erg = SetInputFile(bp->filepath)) == BIF_ENOTEXISTS){
+      glbbp = bp;
diff --git a/print/bibview/patches/patch-ab b/print/bibview/patches/patch-bibview_c
similarity index 62%
rename from print/bibview/patches/patch-ab
rename to print/bibview/patches/patch-bibview_c
index 8887fc743dc..efc1cbded44 100644
--- a/print/bibview/patches/patch-ab
+++ b/print/bibview/patches/patch-bibview_c
@@ -1,6 +1,7 @@
+$OpenBSD: patch-bibview_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
 --- bibview.c.orig	Fri Apr 21 18:49:15 1995
-+++ bibview.c	Thu Sep 11 13:08:28 1997
-@@ -170,9 +170,9 @@
++++ bibview.c	Tue Apr 17 14:30:50 2001
+@@ -170,9 +170,9 @@ int max_bibtex_types;
  /* fallback resources */
  static char *fallback_resources[] = {
  #ifdef GERMAN
diff --git a/print/bibview/patches/patch-af b/print/bibview/patches/patch-ctl_card_c
similarity index 81%
rename from print/bibview/patches/patch-af
rename to print/bibview/patches/patch-ctl_card_c
index 786f077c04f..d4139a18813 100644
--- a/print/bibview/patches/patch-af
+++ b/print/bibview/patches/patch-ctl_card_c
@@ -1,6 +1,7 @@
+$OpenBSD: patch-ctl_card_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
 --- ctl_card.c.orig	Mon May  8 18:25:53 1995
-+++ ctl_card.c	Thu Sep 11 13:08:32 1997
-@@ -659,15 +659,15 @@
++++ ctl_card.c	Tue Apr 17 14:30:50 2001
+@@ -659,15 +659,15 @@ String hlpstring;
        sprintf(aw->shellName, "%s: NEW", glbFldToName(nannote));
     else
        sprintf(aw->shellName, "%s: %s", glbFldToName(nannote), cp->cd->mainkey);
diff --git a/print/bibview/patches/patch-ctl_open_c b/print/bibview/patches/patch-ctl_open_c
new file mode 100644
index 00000000000..62c764e0bb4
--- /dev/null
+++ b/print/bibview/patches/patch-ctl_open_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-ctl_open_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
+--- ctl_open.c.orig	Thu Nov 25 14:11:12 1993
++++ ctl_open.c	Tue Apr 17 14:30:50 2001
+@@ -112,9 +112,9 @@ char *tempName;
+    bp->tempfile = (char *)XtMalloc(strlen(tempName)+1);
+    strcpy(bp->tempfile,tempName);
+ #else
+-   bp->tempfile = (char *)tempnam(NULL, NULL);
++   bp->tempfile = strdup("/tmp/aa.XXXXXXXX");
+ #endif
+-   tempFile = fopen(bp->tempfile, "w" );
++   tempFile = fdopen(mkstemp(bp->tempfile), "w" );
+    fclose(tempFile);
+ 
+    /* display window for bib */
diff --git a/print/bibview/patches/patch-ctl_serv_c b/print/bibview/patches/patch-ctl_serv_c
new file mode 100644
index 00000000000..8fe5eb0be0a
--- /dev/null
+++ b/print/bibview/patches/patch-ctl_serv_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-ctl_serv_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
+--- ctl_serv.c.orig	Thu Nov 25 14:11:13 1993
++++ ctl_serv.c	Tue Apr 17 14:30:50 2001
+@@ -307,11 +307,11 @@ char *tempName;
+       bp->macrofile = (char *)XtMalloc(strlen(tempName)+1);
+       strcpy(bp->macrofile,tempName);
+ #else
+-      bp->macrofile = (char *)tempnam(NULL, NULL);
++      bp->macrofile = strdup("/tmp/aa.XXXXXXXX");
+ #endif
+       if (bp->macrofile == NULL)
+ 	 return(ERR_NOMALLOC);
+-      if ((fh = creat(bp->macrofile, 0700)) == -1)
++      if ((fh = mkstemp(bp->macrofile)) == -1)
+ 	 return(ERR_NO_OPEN_TMP);
+       close(fh);
+    }
diff --git a/print/bibview/patches/patch-ae b/print/bibview/patches/patch-gui_card_c
similarity index 75%
rename from print/bibview/patches/patch-ae
rename to print/bibview/patches/patch-gui_card_c
index 514c65f1592..eb4f1d52f44 100644
--- a/print/bibview/patches/patch-ae
+++ b/print/bibview/patches/patch-gui_card_c
@@ -1,6 +1,7 @@
+$OpenBSD: patch-gui_card_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
 --- gui_card.c.orig	Mon May  8 18:24:55 1995
-+++ gui_card.c	Thu Sep 11 13:08:31 1997
-@@ -370,15 +370,15 @@
++++ gui_card.c	Tue Apr 17 14:30:50 2001
+@@ -370,15 +370,15 @@ CardWinPtr cw;
  CardWidgetsPtr cwp;
  Dimension height;
    
diff --git a/print/bibview/patches/patch-ad b/print/bibview/patches/patch-gui_widg_c
similarity index 78%
rename from print/bibview/patches/patch-ad
rename to print/bibview/patches/patch-gui_widg_c
index 40ac9569de5..c7cb79ea011 100644
--- a/print/bibview/patches/patch-ad
+++ b/print/bibview/patches/patch-gui_widg_c
@@ -1,6 +1,7 @@
+$OpenBSD: patch-gui_widg_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
 --- gui_widg.c.orig	Thu Nov 25 14:11:15 1993
-+++ gui_widg.c	Thu Sep 11 13:08:30 1997
-@@ -330,12 +330,12 @@
++++ gui_widg.c	Tue Apr 17 14:30:50 2001
+@@ -330,12 +330,12 @@ unsigned int key_buttons;
  	            XtNfromHoriz, warnIcon, NULL);
     sprintf(textLabel, "msgText%d", abs((int)errcode));
     if (errcode >= 200){
diff --git a/print/bibview/pkg/COMMENT b/print/bibview/pkg/COMMENT
deleted file mode 100644
index 4332b57d59c..00000000000
--- a/print/bibview/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GUI for manipulating BibTeX bibliography databases
diff --git a/print/bibview/pkg/DESCR b/print/bibview/pkg/DESCR
index 5777ed67007..992d70afccd 100644
--- a/print/bibview/pkg/DESCR
+++ b/print/bibview/pkg/DESCR
@@ -1,23 +1,18 @@
+The program "bibview" is a graphical interface for manipulating
+BibTeX databases.  It supports the user in making new entries,
+searching for entries and moving entries from one BiB to another.
+It is possible to work with more than one BiB simultaneously. 
+bibview is implemented with Xt and Athena Widgets.
 
-                               BIBVIEW 
-            (graphical interface for BibTeX program)
-	     by Holger Martin, Peter Urban, Armin Liebl 
-		  liebla@informatik.tu-muenchen.de
-
-    The program "bibview" is a graphical interface for manipulating
-    BibTeX databases. It supports the user in making new entries,
-    searching for entries and moving entries from one BiB to another.
-    It is possible to work with more than one BiB simultaneously. 
-    bibview is implemented with Xt and Athena Widgets.
-    There are six types of windows in bibview:
-    The main window contains menus for customizing bibview and
-    for working with BiBs on the file level.
-    The bibliography window (one for every open BiB) contains commands
-    for manipulating the BiB.
-    The list window (at most one for every open BiB) shows a list of
-    entries. It displays the fields author, title, type and year.
-    The card window (at most one for every entry) helps editing an entry. 
-    It contains boxes for each field of the entry (according to the type).
-    The fields can be edited by putting the mouse cursor into the field.
-    Macros in fields and the symbol for concatenation ('#') are marked
-    with a preceding '@'.
+There are six types of windows in bibview:
+- The main window contains menus for customizing bibview and
+  for working with BiBs on the file level.
+- The bibliography window (one for every open BiB) contains commands
+  for manipulating the BiB.
+- The list window (at most one for every open BiB) shows a list of
+  entries.  It displays the fields author, title, type and year.
+- The card window (at most one for every entry) helps editing an
+  entry.  It contains boxes for each field of the entry (according
+  to the type).  The fields can be edited by putting the mouse
+  cursor into the field.  Macros in fields and the symbol for
+  concatenation ('#') are marked with a preceding '@'.
diff --git a/print/bibview/pkg/PLIST b/print/bibview/pkg/PLIST
index 8d777739b2d..508a9dde84d 100644
--- a/print/bibview/pkg/PLIST
+++ b/print/bibview/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.3 2001/04/17 13:13:32 naddy Exp $
 bin/bibview
 lib/X11/app-defaults/BibView
 lib/X11/app-defaults/BibView-color