--- config/mh-freebsd.orig	Wed Sep 30 23:22:01 1998
+++ config/mh-freebsd	Wed Sep 30 23:25:17 1998
@@ -1,4 +1,6 @@
-X11_INCLUDE_FLAGS =	-I/usr/X11R6/include
-X11_LIB_FLAGS =		-L/usr/X11R6/lib
-
-appdefaultsdir = 	/usr/X11R6/lib/X11/app-defaults	
+X11_INCLUDE_FLAGS =	-I${X11BASE}/include
+X11_LIB_FLAGS =		-L${X11BASE}/lib
+.if defined (PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf
+X11_LIB_FLAGS += -Wl,-rpath,${X11BASE}/lib
+.endif
+appdefaultsdir = 	${X11BASE}/lib/X11/app-defaults	
