diff options
| author | lesi <lesi@FreeBSD.org> | 2006-01-22 02:55:31 +0800 |
|---|---|---|
| committer | lesi <lesi@FreeBSD.org> | 2006-01-22 02:55:31 +0800 |
| commit | 5e842b27251f782e7263a417799b990314ea0147 (patch) | |
| tree | acac0be49b69da77e5024e5bdd004ec60f1b82d3 /x11 | |
| parent | 1b8c408d9c257ce5287e73ba1966d2e08d6e7c4e (diff) | |
| download | freebsd-ports-gnome-5e842b27251f782e7263a417799b990314ea0147.tar.gz freebsd-ports-gnome-5e842b27251f782e7263a417799b990314ea0147.tar.zst freebsd-ports-gnome-5e842b27251f782e7263a417799b990314ea0147.zip | |
Fixups after removal of separate mtree file for X_WINDOW_SYSTEM=XOrg case.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-aoutlibs/Makefile | 6 | ||||
| -rw-r--r-- | x11/XFree86-aoutlibs/pkg-plist | 2 | ||||
| -rw-r--r-- | x11/bricons/Makefile | 6 | ||||
| -rw-r--r-- | x11/bricons/pkg-plist | 4 |
4 files changed, 3 insertions, 15 deletions
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile index 56091cc2516b..fd5cf182a39c 100644 --- a/x11/XFree86-aoutlibs/Makefile +++ b/x11/XFree86-aoutlibs/Makefile @@ -22,12 +22,6 @@ USE_X_PREFIX= yes .include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} == xfree86-4 -PLIST_SUB+= NEWMTREE="" -.else -PLIST_SUB+= NEWMTREE="@comment " -.endif - .if ${OSVERSION} >= 500113 STRIP= .endif diff --git a/x11/XFree86-aoutlibs/pkg-plist b/x11/XFree86-aoutlibs/pkg-plist index 1155af5fce6f..ad3bc6a4c9df 100644 --- a/x11/XFree86-aoutlibs/pkg-plist +++ b/x11/XFree86-aoutlibs/pkg-plist @@ -14,4 +14,4 @@ lib/aout/libXtst.so.6.1 lib/aout/liboldX.so.6.0 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -%%NEWMTREE%%@dirrm lib/aout +@dirrm lib/aout diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index 37ff1a0f46bd..5346068baa55 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -22,12 +22,6 @@ MAN1= bricons.1 .include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} == xfree86-4 -PLIST_SUB+= NEWMTREE="" -.else -PLIST_SUB+= NEWMTREE="@comment " -.endif - post-patch: @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Xbricons diff --git a/x11/bricons/pkg-plist b/x11/bricons/pkg-plist index 0c488ffd2d83..239f1a11077f 100644 --- a/x11/bricons/pkg-plist +++ b/x11/bricons/pkg-plist @@ -8,5 +8,5 @@ include/X11/pixmaps/clock.xpm include/X11/pixmaps/editor.xpm include/X11/pixmaps/mail.xpm include/X11/pixmaps/news.xpm -%%NEWMTREE%%@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true -%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true +@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true |