[Midnightbsd-cvs] mports: bsd.mport.mk: USE_XPM now uses USE_XORG so no xlib

[laffer1 at midnightbsd.org]

Log Message:
-----------
USE_XPM now uses USE_XORG so no xlib automatically.

USE_LDCONFIG now works right with linux ports.

OSVERSION takes tabs or spaces.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.87 -> r1.88)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.87
retrieving revision 1.88
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.87 -r1.88
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -1116,9 +1116,9 @@
 # Get __FreeBSD_version
 .if !defined(OSVERSION)
 .if exists(${DESTDIR}/usr/include/sys/param.h)
-OSVERSION!=	${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
+OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
 .elif exists(${DESTDIR}/usr/src/sys/sys/param.h)
-OSVERSION!=	${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h
+OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h
 .else
 OSVERSION!=	${SYSCTL} -n kern.osreldate
 .endif
@@ -1697,7 +1697,7 @@
 .	endif
 .endif
 
-.if defined(USE_LINUX_PREFIX) && defined(INSTALLS_SHLIB)
+.if defined(USE_LINUX_PREFIX) && (defined(INSTALLS_SHLIB) || defined(USE_LDCONFIG))
 # we need ${LINUXBASE}/sbin/ldconfig
 USE_LINUX?=	yes
 .endif
@@ -1803,7 +1803,7 @@
 
 
 .if defined(USE_XPM)
-USE_XLIB=			yes
+USE_XORG+=			xpm
 .endif
 
 XAWVER=				8