From marcus@marcus.grupos.com.br  Wed Aug 17 02:21:49 2005
Return-Path: <marcus@marcus.grupos.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 885D616A41F;
	Wed, 17 Aug 2005 02:21:49 +0000 (GMT)
	(envelope-from marcus@marcus.grupos.com.br)
Received: from mail.grupos.com.br (mail.grupos.com.br [200.203.183.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 16CA343D46;
	Wed, 17 Aug 2005 02:21:48 +0000 (GMT)
	(envelope-from marcus@marcus.grupos.com.br)
Received: from corp.grupos.com.br (unknown [150.162.166.55])
	by mail.grupos.com.br (Postfix) with ESMTP id 1281711E256;
	Tue, 16 Aug 2005 23:21:47 -0300 (BRT)
Received: from marcus.grupos.com.br (unknown [150.162.166.51])
	by corp.grupos.com.br (Postfix) with ESMTP id DF9705494;
	Tue, 16 Aug 2005 23:21:46 -0300 (BRT)
Received: from marcus.grupos.com.br (localhost [127.0.0.1])
	by marcus.grupos.com.br (8.13.4/8.13.4) with ESMTP id j7H2Lk0P001918;
	Tue, 16 Aug 2005 23:21:46 -0300 (BRT)
	(envelope-from marcus@marcus.grupos.com.br)
Received: (from root@localhost)
	by marcus.grupos.com.br (8.13.4/8.13.4/Submit) id j7H2LjvE001917;
	Tue, 16 Aug 2005 23:21:46 -0300 (BRT)
	(envelope-from marcus)
Message-Id: <200508170221.j7H2LjvE001917@marcus.grupos.com.br>
Date: Tue, 16 Aug 2005 23:21:46 -0300 (BRT)
From: Marcus Grando <marcus@corp.grupos.com.br>
Reply-To: Marcus Grando <marcus@corp.grupos.com.br>
To: FreeBSD-gnats-submit@freebsd.org
Cc: trevor@freebsd.org
Subject: Update port: x11/wrapper fix plist and unbroken
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         85024
>Category:       ports
>Synopsis:       Update port: x11/wrapper fix plist and unbroken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    trevor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 17 02:30:21 GMT 2005
>Closed-Date:    Tue Sep 06 19:21:00 GMT 2005
>Last-Modified:  Tue Sep 06 19:21:00 GMT 2005
>Originator:     Marcus Grando
>Release:        FreeBSD 6.0-BETA2 i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-BETA2 FreeBSD 6.0-BETA2 #10: Mon Aug 15 19:47:41 BRT 2005 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386


	
>Description:

- Fix plist and unBROKEN

	
>How-To-Repeat:
	
>Fix:

	

--- wrapper.patch begins here ---
diff -ruN wrapper.orig/Makefile wrapper/Makefile
--- wrapper.orig/Makefile	Wed Mar 30 19:27:35 2005
+++ wrapper/Makefile	Tue Aug 16 23:19:05 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	wrapper
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 DISTNAME=	# intentionally left blank
 EXTRACT_SUFX=	# intentionally left blank
@@ -24,7 +24,6 @@
 XSERVER=	-DXSERVER_PATH=\"/usr/X11R6/bin/Xorg\"
 PKGNAMEPREFIX=	xorg-
 COMMENT=	Wrapper for X.org X11 server
-BROKEN=		Incomplete pkg-plist
 .elif ${X_WINDOW_SYSTEM:L} == xfree86-4
 XSERVER=	-DXSERVER_PATH=\"/usr/X11R6/bin/XFree86\"
 RUN_DEPENDS=	XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server
diff -ruN wrapper.orig/pkg-deinstall wrapper/pkg-deinstall
--- wrapper.orig/pkg-deinstall	Thu Apr 11 08:56:55 2002
+++ wrapper/pkg-deinstall	Tue Aug 16 23:16:19 2005
@@ -1,4 +1,14 @@
 #!/bin/sh
 if [ -e ${PKG_PREFIX}/bin/X.bck ]; then
 	mv ${PKG_PREFIX}/bin/X.bck ${PKG_PREFIX}/bin/X
+else
+	if [ -x ${PKG_PREFIX}/bin/XFree86 ]; then
+		ln -sf ${PKG_PREFIX}/bin/XFree86 ${PKG_PREFIX}/bin/X
+		exit 0
+	elif [ -x ${PKG_PREFIX}/bin/Xorg ]; then
+		ln -sf ${PKG_PREFIX}/bin/Xorg ${PKG_PREFIX}/bin/X
+		exit 0
+	else
+		rm -f ${PKG_PREFIX}/bin/X
+	fi
 fi
--- wrapper.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->trevor 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Aug 17 06:30:44 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85024 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Tue Sep 6 19:20:52 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85024 
>Unformatted:
