ports/69545: [PATCH] Fix XFree86-4-libraries/Makefile.inc after X.Org switch

[Dejan Lesjak]

>Number:         69545
>Category:       ports
>Synopsis:       [PATCH] Fix XFree86-4-libraries/Makefile.inc after X.Org switch
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 24 21:30:16 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dejan Lesjak
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD idefix.ijs.si 5.2-CURRENT FreeBSD 5.2-CURRENT #5: Thu Jul 22 03:16:32 CEST 2004 lesi at idefix.ijs.si:/usr/obj/usr/src/sys/IDEFIX i386


	
>Description:
The bsd.port.mk no longer defines XFREE86_VERSION?=4 for XFree86-4 ports.
However ports/x11/XFree86-4-libraries/Makefile.inc still expects this
define, which breaks xfree ports. Since ports now check for X_WINDOW_SYSTEM
variable in their makefiles, this check can now be removed.
Attached is the patch for Makefile.inc.
	
>How-To-Repeat:
	
>Fix:

	

--- Makefile.inc.diff begins here ---
Index: Makefile.inc
===================================================================
RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-libraries/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- Makefile.inc	6 Feb 2004 04:41:48 -0000	1.6
+++ Makefile.inc	24 Jul 2004 21:13:57 -0000
@@ -26,13 +26,6 @@
 XINSTALL_DIRS?=	${XBUILD_DIRS}
 _XINCLUDE_DIRS=	include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
 
-pre-everything::
-	@if [ "x${XFREE86_VERSION}" != "x4" ]; then \
-		${ECHO_MSG} "If you use the XFree86-4 ports you must have XFREE86_VERSION=4"; \
-		${ECHO_MSG} "set in your /etc/make.conf."; \
-		${FALSE}; \
-	fi;
-
 .if !target(pre-configure)
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
--- Makefile.inc.diff ends here ---


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