Date: Sat, 7 May 2005 13:06:31 +0200 (CEST) From: Oliver Lehmann <oliver@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <oliver@FreeBSD.org> Subject: ports/80726: update-port: www/pserv (stop installing own etc/mime.types) Message-ID: <200505071106.j47B6V1j034982@kartoffel.salatschuessel.net> Resent-Message-ID: <200505071110.j47BA28g084574@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80726
>Category: ports
>Synopsis: update-port: www/pserv (stop installing own etc/mime.types)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat May 07 11:10: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@nudel.salatschuessel.net:/usr/obj/i386-5.3/usr/src/sys/KARTOFFEL i386
>Description:
www/pserv installs its own etc/mime.types and didn't takes care about previously
installed mime.types (it's conflicting with other ports)
>How-To-Repeat:
>Fix:
--- patch-pserv begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/pserv/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 24 Nov 2004 14:16:13 -0000 1.8
+++ Makefile 7 May 2005 11:04:51 -0000
@@ -15,6 +15,8 @@
MAINTAINER= ale@FreeBSD.org
COMMENT= A portable and small webserver written in C
+RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+
WRKSRC= ${WRKDIR}/${PORTNAME}
BUILD_WRKSRC= ${WRKSRC}/sources
USE_REINPLACE= yes
@@ -38,7 +40,6 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sources/pserv ${PREFIX}/sbin/
- ${INSTALL_DATA} ${WRKSRC}/defaults/mime_types.dat ${PREFIX}/etc/mime.types
${INSTALL_DATA} ${WRKSRC}/defaults/pserv.conf ${PREFIX}/etc/
${INSTALL_SCRIPT} ${FILESDIR}/pserv.sh ${PREFIX}/etc/rc.d/
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/pserv/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 17 Oct 2003 08:11:55 -0000 1.1
+++ pkg-plist 7 May 2005 11:04:51 -0000
@@ -1,4 +1,3 @@
sbin/pserv
-etc/mime.types
etc/pserv.conf
etc/rc.d/pserv.sh
--- patch-pserv ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505071106.j47B6V1j034982>