Date: Tue, 16 Aug 2005 23:21:46 -0300 (BRT) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: trevor@FreeBSD.org Subject: ports/85024: Update port: x11/wrapper fix plist and unbroken Message-ID: <200508170221.j7H2LjvE001917@marcus.grupos.com.br> Resent-Message-ID: <200508170230.j7H2ULp1037518@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85024
>Category: ports
>Synopsis: Update port: x11/wrapper fix plist and unbroken
>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: Wed Aug 17 02:30:21 GMT 2005
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508170221.j7H2LjvE001917>