ports/80731: update-port: www/webfs

[Oliver Lehmann]

>Number:         80731
>Category:       ports
>Synopsis:       update-port: www/webfs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 07 12:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Lehmann
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 5.3-STABLE FreeBSD 5.3-STABLE #0: Sun Feb 6 20:33:04 CET 2005 olivleh1 at nudel.salatschuessel.net:/usr/obj/i386-5.3/usr/src/sys/KARTOFFEL i386

>Description:
	update to 1.21
	update MASTER_SITES
	utilize misc/mime-support

	remove all patch files!

>How-To-Repeat:
>Fix:


--- patch-webfs begins here ---
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/ports/www/webfs/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	4 Feb 2004 05:09:37 -0000	1.18
+++ Makefile	7 May 2005 12:09:56 -0000
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	webfs
-PORTVERSION=	1.20
-PORTREVISION=	1
+PORTVERSION=	1.21
+PORTREVISION=	0
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://bytesex.org/misc/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://dl.bytesex.org/releases/webfs/
 
 MAINTAINER=	jedgar at FreeBSD.org
 COMMENT=	A simple http server for static content
 
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
@@ -25,7 +26,7 @@
 MAKE_ENV+=	LDLIBS="-lssl -lcrypto" USE_DIET=no
 
 MAN1=		webfsd.1
-MIMEFILE?=	${PREFIX}/etc/webfsd/mime.types
+MIMEFILE?=	${LOCALBASE}/etc/mime.types
 
 .include <bsd.port.pre.mk>
 
@@ -42,7 +43,7 @@
 	@${ECHO_CMD} "==========================================="
 	@${ECHO_CMD} ""
 
-do-configure:
+post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/GNUmakefile
 	@${REINPLACE_CMD} -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/webfsd.man
 .if defined(WITHOUT_OPENSSL)
@@ -52,9 +53,5 @@
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/webfsd ${PREFIX}/sbin
 	@${INSTALL_MAN} ${WRKSRC}/webfsd.man ${PREFIX}/man/man1/webfsd.1
-.if !exists(${PREFIX}/etc/webfsd/mime.types)
-	@${MKDIR} ${PREFIX}/etc/webfsd
-	@${ECHO_CMD} "# Insert mime types here" > ${PREFIX}/etc/webfsd/mime.types
-.endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /usr/local/cvsroot/ports/www/webfs/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	31 Mar 2004 03:12:31 -0000	1.12
+++ distinfo	7 May 2005 12:09:56 -0000
@@ -1,2 +1,2 @@
-MD5 (webfs_1.20.tar.gz) = 90c54905e4312eb45ad38d010a127208
-SIZE (webfs_1.20.tar.gz) = 50998
+MD5 (webfs-1.21.tar.gz) = 6dc125fe160479404147e7bbfc781dbc
+SIZE(webfs-1.21.tar.gz) = 44249
Index: pkg-plist
===================================================================
RCS file: /usr/local/cvsroot/ports/www/webfs/pkg-plist,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-plist
--- pkg-plist	26 Nov 1999 19:34:11 -0000	1.1.1.1
+++ pkg-plist	7 May 2005 12:09:56 -0000
@@ -1,3 +1 @@
-etc/webfsd/mime.types
 sbin/webfsd
- at dirrm etc/webfsd
--- patch-webfs ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: