ports/124506: [patch] Mk/bsd.port.mk Retire USE_XPM

[Alex Kozlov]

>Number:         124506
>Category:       ports
>Synopsis:       [patch] Mk/bsd.port.mk Retire USE_XPM
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 12 09:00:08 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Alex Kozlov
>Release:        FreeBSD 6.3
>Organization:
private
>Environment:
>Description:
USE_XPM is deprecated and no one port use it anymore.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Mk/bsd.port.mk
@@ -384,7 +384,7 @@
 #				  Supported components are: glut, glu, glw, gl and linux.
 #				  If set to "yes", this is equivalent to "glu". Note that
 #				  glut depends on glu, glw and glu depend on gl.
-# USE_MOTIF		- If set, this port uses a Motif toolkit.  Implies USE_XPM.
+# USE_MOTIF		- If set, this port uses a Motif toolkit. Implies USE_XORG+= xpm
 # NO_OPENMOTIF	- If set, this port uses a custom Motif toolkit
 #				  instead of Openmotif.
 #				  Used only when USE_MOTIF is set.
@@ -394,7 +394,6 @@
 ##
 # USE_SDL		- If set, this port uses the sdl libraries.
 #				  See bsd.sdl.mk for more information.
-# USE_XPM		- If set, this port uses the xpm graphics libraries.
 ##
 # USE_OPENSSL	- If set, this port relies on the OpenSSL package.
 ##
@@ -1820,7 +1819,7 @@
 .endif
 
 .if defined(USE_MOTIF)
-USE_XPM=			yes
+USE_XORG+=			xpm
 .if defined(WANT_LESSTIF)
 LIB_DEPENDS+=		Xm:${PORTSDIR}/x11-toolkits/lesstif
 NO_OPENMOTIF=		yes
@@ -1866,7 +1865,7 @@
 .endif
 
 .if defined(USE_XPM)
-USE_XORG+=			xpm
+IGNORE=		USE_XPM is deprecated. Use USE_XORG=xpm instead.
 .endif
 
 XAWVER=				8


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