Date: Sun, 17 Jun 2007 16:57:43 +0200 (CEST) From: Dag-Erling Smørgrav <des@des.no> To: FreeBSD-gnats-submit@FreeBSD.org Cc: flz@FreeBSD.org Subject: ports/113799: [PATCH] ease USE_XLIB -> USE_XORG transition Message-ID: <20070617145743.448AF5A5E@dwp.des.no> Resent-Message-ID: <200706171500.l5HF08D8020572@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113799
>Category: ports
>Synopsis: [PATCH] ease USE_XLIB -> USE_XORG transition
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 17 15:00:07 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Dag-Erling Smørgrav
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dwp.des.no 7.0-CURRENT FreeBSD 7.0-CURRENT #35: Tue May 29 21:40:11 CEST 2007 des@dwp.des.no:/usr/obj/usr/src/sys/dwp i386
>Description:
Attached are two patches. The first one modifies bsd.port.mk to ease the
transition from USE_XLIB to USE_XORG by translating USE_XORG into the correct
incantations for XFree86-4. The second demonstrates this by modifying the
editors/emacs patch to use USE_XORG instead of USE_XLIB.
use_xorg.diff:
1) if USE_XPM is defined, add "xpm" to USE_XORG
2) if USE_XORG is defined and X_WINDOW_SYSTEM is xfree86-4, define USE_XLIB
3) if X_WINDOW_SYSTEM is xfree86-4 and USE_XORG contains "xpm", add libXpm
to LIB_DEPENDS
emacs.diff:
1) remove USE_XLIB and USE_XPM
2) list all required X libraries in USE_XORG
>How-To-Repeat:
>Fix:
--- use_xorg.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.569
diff -u -r1.569 bsd.port.mk
--- Mk/bsd.port.mk 16 Jun 2007 19:07:42 -0000 1.569
+++ Mk/bsd.port.mk 17 Jun 2007 14:09:06 -0000
@@ -1972,6 +1972,10 @@
BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
.endif
+.if defined(USE_XPM)
+USE_XORG+= xpm
+.endif
+
.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY)
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
@@ -1980,23 +1984,19 @@
.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-.if defined(USE_XPM)
+.if defined(USE_XORG)
USE_XLIB= yes
.endif
+.if ${USE_XORG:Mxpm}
+LIB_DEPENDS+= Xpm.4:${PORTSDIR}/x11/libXpm
+.endif
+
XAWVER= 7
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
.else
-.if defined(USE_XPM)
-LIB_DEPENDS+= Xpm.4:${PORTSDIR}/x11/libXpm
-# XXX - At some point we'll have to fix ports to use USE_XORG to
-# the right value and remove both USE_XPM and USE_XLIB. Hopefully
-# XFree86-4 will be gone in the meantime.
-USE_XLIB= yes
-.endif
-
XAWVER= 8
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
--- use_xorg.diff ends here ---
--- emacs.diff begins here ---
Index: editors/emacs/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/emacs/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- editors/emacs/Makefile 19 May 2007 20:04:03 -0000 1.69
+++ editors/emacs/Makefile 17 Jun 2007 14:54:37 -0000
@@ -25,8 +25,7 @@
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xmu xt sm ice xext x11 xau xdmcp xpm
.endif
.if defined(WITH_MENUBAR_FONTSET)
--- emacs.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070617145743.448AF5A5E>