Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.544
diff -u -r1.544 bsd.port.mk
--- bsd.port.mk	30 Sep 2006 19:25:45 -0000	1.544
+++ bsd.port.mk	28 Nov 2006 01:03:54 -0000
@@ -5417,8 +5417,23 @@
 	@for i in ${_TMLINKS:N${_PREFIX}*:S|^/||}; do \
 		${ECHO_CMD} "$$i" >> ${TMPPLIST}; \
 	done
-	@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
 .endif
+
+# XXX: X_PLIST_FILES and X_PLIST_DIRS should be removed when Xorg is moved to LOCALBASE
+
+.if defined(X_PLIST_FILES)
+	@${ECHO_CMD} '@cwd ${X11BASE}' >> ${TMPPLIST}
+	@for i in ${X_PLIST_FILES}; do \
+		${ECHO_CMD} "$$i" >> ${TMPPLIST}; \
+	done
+.endif
+.if defined(X_PLIST_DIRS)
+	@${ECHO_CMD} '@cwd ${X11BASE}' >> ${TMPPLIST}
+	@for dir in ${X_PLIST_DIRS}; do \
+		${ECHO_CMD} "$$dir" | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} \
+	done
+.endif	
+	@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
 	@for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
 		${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \
 	done