Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/devel/libmagic/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile	18 Oct 2010 17:47:54 -0000	1.11
+++ Makefile	31 Oct 2010 14:40:37 -0000
@@ -1,27 +1,27 @@
 # $OpenBSD: Makefile,v 1.11 2010/10/18 17:47:54 espie Exp $
 
-COMMENT=	library to determine file type
-V=		5.00
-DISTNAME= 	file-${V}
-PKGNAME=	libmagic-${V}
-SHARED_LIBS=	magic	2.0
-CATEGORIES=	sysutils devel
+COMMENT =	library to determine file type
+V =		5.04
+DISTNAME = 	file-${V}
+PKGNAME =	libmagic-${V}
+SHARED_LIBS =	magic	2.0
+CATEGORIES =	sysutils devel
 
-HOMEPAGE=	ftp://ftp.astron.com/pub/file/
+HOMEPAGE =	ftp://ftp.astron.com/pub/file/
 
-MAINTAINER=	Rui Reis <rui@openbsd.org>
+MAINTAINER =	Rui Reis <rui@openbsd.org>
 
 # BSD
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES=	ftp://ftp.astron.com/pub/file/
+MASTER_SITES =	ftp://ftp.astron.com/pub/file/
 
-WANTLIB=	z 
-CONFIGURE_STYLE=gnu
-USE_LIBTOOL=	Yes
+WANTLIB =	z 
+CONFIGURE_STYLE = gnu
+USE_LIBTOOL =	Yes
 USE_GROFF =	Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/devel/libmagic/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo	4 Apr 2009 18:28:14 -0000	1.8
+++ distinfo	31 Oct 2010 14:40:37 -0000
@@ -1,5 +1,5 @@
-MD5 (file-5.00.tar.gz) = /QtM5Vp1YVFingbqo0EeDA==
-RMD160 (file-5.00.tar.gz) = hAFwc19LdHgJPaRv7lId+bEIK9w=
-SHA1 (file-5.00.tar.gz) = 5YAz3++kR4KqNBVXUc6IyGxMEkQ=
-SHA256 (file-5.00.tar.gz) = KJvAZ9eip+UkN0KL0Oed+QMAKP0Twm6Xcuvx38jZ1ck=
-SIZE (file-5.00.tar.gz) = 600905
+MD5 (file-5.04.tar.gz) = rMregf8cx3SQS0fHLIruoA==
+RMD160 (file-5.04.tar.gz) = LuDcU1pPtvBpUPgYgncsw0+YGYQ=
+SHA1 (file-5.04.tar.gz) = Vt33E1RxqmVjNO2P7+ERK8zMLMM=
+SHA256 (file-5.04.tar.gz) = TJ5ueZTnTLM4Y3SukbBV0mrJa50+gv0VeuLWLoekJgw=
+SIZE (file-5.04.tar.gz) = 621361
Index: patches/patch-configure
===================================================================
RCS file: /cvs/openbsd/ports/devel/libmagic/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure	4 Apr 2009 18:28:15 -0000	1.2
+++ patches/patch-configure	31 Oct 2010 14:40:37 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.2 2009/04/04 18:28:15 rui Exp $
---- configure.orig	Tue Feb  3 20:16:11 2009
-+++ configure	Sat Mar 28 13:28:59 2009
-@@ -23930,7 +23930,7 @@ echo "${ECHO_T}yes" >&6; }
+--- configure.orig      Fri Jan 22 22:09:26 2010
++++ configure   Sun Oct 31 15:36:48 2010
+@@ -23559,7 +23559,7 @@
     WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
         -Wmissing-declarations -Wredundant-decls -Wnested-externs \
         -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
@@ -10,12 +10,13 @@ $OpenBSD: patch-configure,v 1.2 2009/04/
  fi
  else
  
-@@ -23944,7 +23944,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -23569,7 +23569,7 @@
     WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
         -Wmissing-declarations -Wredundant-decls -Wnested-externs \
         -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
 -       -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
 +       -Wcast-qual -Wwrite-strings"
- fi
- fi
- 
+ else
+    WARNINGS=
+    { echo "$as_me:$LINENO: result: no" >&5
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/openbsd/ports/devel/libmagic/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST	25 Sep 2008 20:43:56 -0000	1.3
+++ pkg/PLIST	31 Oct 2010 14:40:37 -0000
@@ -7,5 +7,4 @@ lib/libmagic.la
 @comment @man man/man1/file.1
 @man man/man3/libmagic.3
 @man man/man4/magic.4
-share/file/
-share/file/magic.mgc
+share/misc/magic.mgc