From 5e842b27251f782e7263a417799b990314ea0147 Mon Sep 17 00:00:00 2001
From: lesi <lesi@FreeBSD.org>
Date: Sat, 21 Jan 2006 18:55:31 +0000
Subject: Fixups after removal of separate mtree file for X_WINDOW_SYSTEM=XOrg
 case.

---
 databases/xmysqladmin/Makefile  | 10 +---------
 databases/xmysqladmin/pkg-plist |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'databases')

diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 71aa0f375b1..7babaf472da 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -25,12 +25,4 @@ ALL_TARGET=	xmysqladmin
 pre-su-install:
 	@${MKDIR} ${PREFIX}/include/X11/pixmaps
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/xmysqladmin/pkg-plist b/databases/xmysqladmin/pkg-plist
index 1cebab36da0..76b5f9e98bb 100644
--- a/databases/xmysqladmin/pkg-plist
+++ b/databases/xmysqladmin/pkg-plist
@@ -1,3 +1,3 @@
 bin/xmysqladmin
 include/X11/pixmaps/mysql.xpm
-%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
-- 
cgit