diff options
author | lesi <lesi@FreeBSD.org> | 2005-06-15 10:42:14 +0800 |
---|---|---|
committer | lesi <lesi@FreeBSD.org> | 2005-06-15 10:42:14 +0800 |
commit | 97905f8a7c8bde78045d3d4e0c7381d732562a8e (patch) | |
tree | c48951d08bfad18656a10e4b6dd5d82feb0387f5 /x11-fonts | |
parent | ecf40d2a6837b577969dd569157afeaf4ab4fa83 (diff) | |
download | freebsd-ports-gnome-97905f8a7c8bde78045d3d4e0c7381d732562a8e.tar.gz freebsd-ports-gnome-97905f8a7c8bde78045d3d4e0c7381d732562a8e.tar.zst freebsd-ports-gnome-97905f8a7c8bde78045d3d4e0c7381d732562a8e.zip |
Fix up plist after modifications to mtree (BSD.x11-4.dist rev. 1.27).
Diffstat (limited to 'x11-fonts')
-rw-r--r-- | x11-fonts/intlfonts/Makefile | 1 | ||||
-rw-r--r-- | x11-fonts/intlfonts/files/DEINSTALL.tmpl | 3 | ||||
-rw-r--r-- | x11-fonts/libXfont/Makefile | 10 | ||||
-rw-r--r-- | x11-fonts/libXfont/pkg-plist | 2 | ||||
-rw-r--r-- | x11-fonts/libXft/Makefile | 6 | ||||
-rw-r--r-- | x11-fonts/libXft/pkg-plist | 1 | ||||
-rw-r--r-- | x11-fonts/tv-fonts/Makefile | 10 | ||||
-rw-r--r-- | x11-fonts/tv-fonts/pkg-plist | 4 |
8 files changed, 13 insertions, 24 deletions
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index 4dca71e2adf0..c7a6dc9d7bbc 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -55,7 +55,6 @@ do-build: -e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \ -e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - -e 's,%%XWINSYS%%,${X_WINDOW_SYSTEM:L},g' \ < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \ done diff --git a/x11-fonts/intlfonts/files/DEINSTALL.tmpl b/x11-fonts/intlfonts/files/DEINSTALL.tmpl index b6e1d96284d7..3b66be76ac2c 100644 --- a/x11-fonts/intlfonts/files/DEINSTALL.tmpl +++ b/x11-fonts/intlfonts/files/DEINSTALL.tmpl @@ -15,6 +15,5 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then [ `wc -c ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale # Remove a backup file made by type1inst rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale.bak - [ "%%XWINSYS%%" = "xorg" ] && \ - (rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true) + rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true fi diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index f539d17cf1d9..c469f839c602 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -28,12 +28,4 @@ CONFIGURE_ARGS= --enable-freetype INSTALLS_SHLIB= yes USE_GNOME= gnomehack pkgconfig -.include <bsd.port.pre.mk> - -.if ${X_WINDOW_SYSTEM:L} == xorg -PLIST_SUB+= NEWMTREE="" -.else -PLIST_SUB+= NEWMTREE="@comment " -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/libXfont/pkg-plist b/x11-fonts/libXfont/pkg-plist index e3a1735d1674..874de36d6e0c 100644 --- a/x11-fonts/libXfont/pkg-plist +++ b/x11-fonts/libXfont/pkg-plist @@ -13,4 +13,4 @@ lib/libXfont.la lib/libXfont.so lib/libXfont.so.1 libdata/pkgconfig/xfont.pc -%%NEWMTREE%%@dirrm include/X11/fonts +@dirrm include/X11/fonts diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index d20a0946116b..9c83072f3137 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -33,6 +33,12 @@ MAN3= Xft.3 IGNORE= Xft requires Render extension headers/library to build. .endif +.if ${X_WINDOW_SYSTEM:L} == xfree86-4 +PLIST_SUB+= NEWMTREE="" +.else +PLIST_SUB+= NEWMTREE="@comment " +.endif + .if defined(WITH_CJK) PATCH_SITES= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ http://bsdchat.com/dist/firefly-cjk-patchset/ diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist index 75c5e1209701..84173a9f777a 100644 --- a/x11-fonts/libXft/pkg-plist +++ b/x11-fonts/libXft/pkg-plist @@ -5,3 +5,4 @@ lib/libXft.a lib/libXft.so lib/libXft.so.2 libdata/pkgconfig/xft.pc +%%NEWMTREE%%@dirrm include/X11/Xft diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile index c139c7fbe115..c7ac1e4967b5 100644 --- a/x11-fonts/tv-fonts/Makefile +++ b/x11-fonts/tv-fonts/Makefile @@ -38,12 +38,4 @@ do-install: post-install: @-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} -.include <bsd.port.pre.mk> - -.if ${X_WINDOW_SYSTEM:L} == xorg -PLIST_SUB+= NEWMTREE="" -.else -PLIST_SUB+= NEWMTREE="@comment " -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist index d4be0f73ecd2..0a80a7c40aa4 100644 --- a/x11-fonts/tv-fonts/pkg-plist +++ b/x11-fonts/tv-fonts/pkg-plist @@ -22,5 +22,5 @@ lib/X11/fonts/misc/teletext4.pcf.gz lib/X11/fonts/misc/teletext4i.pcf.gz @unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 || true @unexec fc-cache -f -v %D/lib/X11/fonts/misc || true -%%NEWMTREE%%@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi -%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true +@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi +@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true |