aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-aoutlibs/Makefile6
-rw-r--r--x11/XFree86-aoutlibs/pkg-plist1
-rw-r--r--x11/bricons/Makefile8
-rw-r--r--x11/bricons/pkg-plist2
-rw-r--r--x11/libICE/Makefile10
-rw-r--r--x11/libICE/pkg-plist2
-rw-r--r--x11/libSM/Makefile10
-rw-r--r--x11/libSM/pkg-plist2
-rw-r--r--x11/libXcursor/Makefile10
-rw-r--r--x11/libXcursor/pkg-plist2
-rw-r--r--x11/libXfont/Makefile10
-rw-r--r--x11/libXfont/pkg-plist2
-rw-r--r--x11/panoramixext/Makefile10
-rw-r--r--x11/panoramixext/pkg-plist2
-rw-r--r--x11/printext/Makefile10
-rw-r--r--x11/printext/pkg-plist2
-rw-r--r--x11/randrext/Makefile10
-rw-r--r--x11/randrext/pkg-plist2
-rw-r--r--x11/renderext/Makefile10
-rw-r--r--x11/renderext/pkg-plist2
-rw-r--r--x11/resourceext/Makefile10
-rw-r--r--x11/resourceext/pkg-plist2
-rw-r--r--x11/xextensions/Makefile10
-rw-r--r--x11/xextensions/pkg-plist2
-rw-r--r--x11/xfree86_xkb_xml/Makefile10
-rw-r--r--x11/xfree86_xkb_xml/pkg-plist4
26 files changed, 40 insertions, 111 deletions
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index fd5cf182a39c..56091cc2516b 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -22,6 +22,12 @@ 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 c56fe55aa485..1155af5fce6f 100644
--- a/x11/XFree86-aoutlibs/pkg-plist
+++ b/x11/XFree86-aoutlibs/pkg-plist
@@ -14,3 +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
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 116f354a94e6..37ff1a0f46bd 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -22,12 +22,20 @@ 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
post-install:
${INSTALL_DATA} ${WRKSRC}/Xbricons ${PREFIX}/lib/X11/app-defaults
+ ${MKDIR} ${PREFIX}/include/X11/bitmaps
${INSTALL_DATA} ${WRKSRC}/bitmaps/* ${PREFIX}/include/X11/bitmaps
+ ${MKDIR} ${PREFIX}/include/X11/pixmaps
${INSTALL_DATA} ${WRKSRC}/*.xpm ${PREFIX}/include/X11/pixmaps
@${ECHO_MSG} ""
@${ECHO_MSG} " Use ./files/DOTbriconsrc as an example. This file"
diff --git a/x11/bricons/pkg-plist b/x11/bricons/pkg-plist
index b7251ac0458f..0c488ffd2d83 100644
--- a/x11/bricons/pkg-plist
+++ b/x11/bricons/pkg-plist
@@ -8,3 +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
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 54804bc1d7c7..37c8671d24cb 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -29,12 +29,4 @@ USE_INC_LIBTOOL_VER=13
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/libICE/pkg-plist b/x11/libICE/pkg-plist
index 70f3203b41b7..6ca157c05f4e 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -10,4 +10,4 @@ lib/libICE.la
lib/libICE.so
lib/libICE.so.6
libdata/pkgconfig/ice.pc
-%%NEWMTREE%%@dirrm include/X11/ICE
+@dirrm include/X11/ICE
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 50fbc75f42a4..f092977a6c65 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -29,12 +29,4 @@ USE_LIBTOOL_VER=13
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/libSM/pkg-plist b/x11/libSM/pkg-plist
index 9facfbb580a0..ccb0046d833c 100644
--- a/x11/libSM/pkg-plist
+++ b/x11/libSM/pkg-plist
@@ -6,4 +6,4 @@ lib/libSM.la
lib/libSM.so
lib/libSM.so.6
libdata/pkgconfig/sm.pc
-%%NEWMTREE%%@dirrm include/X11/SM
+@dirrm include/X11/SM
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 2409ff398345..59e0b37fd97b 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -35,12 +35,4 @@ MAN3= Xcursor.3
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/libXcursor/pkg-plist b/x11/libXcursor/pkg-plist
index e48cebfa64ae..0a6c4807af0b 100644
--- a/x11/libXcursor/pkg-plist
+++ b/x11/libXcursor/pkg-plist
@@ -4,4 +4,4 @@ lib/libXcursor.la
lib/libXcursor.so
lib/libXcursor.so.1
libdata/pkgconfig/xcursor.pc
-%%NEWMTREE%%@dirrm include/X11/Xcursor
+@dirrm include/X11/Xcursor
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index f539d17cf1d9..c469f839c602 100644
--- a/x11/libXfont/Makefile
+++ b/x11/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/libXfont/pkg-plist b/x11/libXfont/pkg-plist
index e3a1735d1674..874de36d6e0c 100644
--- a/x11/libXfont/pkg-plist
+++ b/x11/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/panoramixext/Makefile b/x11/panoramixext/Makefile
index 70067598b5ac..dd18038b3917 100644
--- a/x11/panoramixext/Makefile
+++ b/x11/panoramixext/Makefile
@@ -22,12 +22,4 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_GNOME= gnomehack
-.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/panoramixext/pkg-plist b/x11/panoramixext/pkg-plist
index 07eea2b5f045..1192f167d8e7 100644
--- a/x11/panoramixext/pkg-plist
+++ b/x11/panoramixext/pkg-plist
@@ -1,4 +1,4 @@
include/X11/extensions/panoramiXext.h
include/X11/extensions/panoramiXproto.h
libdata/pkgconfig/panoramixext.pc
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/printext/Makefile b/x11/printext/Makefile
index f3a7aee0048e..c30f81c78a07 100644
--- a/x11/printext/Makefile
+++ b/x11/printext/Makefile
@@ -31,12 +31,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/Print.h ${DEST}
${INSTALL_DATA} ${WRKSRC}/Printstr.h ${DEST}
-.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/printext/pkg-plist b/x11/printext/pkg-plist
index 1b313ce50faf..e1463b7ea562 100644
--- a/x11/printext/pkg-plist
+++ b/x11/printext/pkg-plist
@@ -1,3 +1,3 @@
include/X11/extensions/Print.h
include/X11/extensions/Printstr.h
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile
index 73b4dcd1e0ff..0100ed2092d3 100644
--- a/x11/randrext/Makefile
+++ b/x11/randrext/Makefile
@@ -22,12 +22,4 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
NO_BUILD= yes
-.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/randrext/pkg-plist b/x11/randrext/pkg-plist
index 1b90cc35b183..18ab2f63a4c5 100644
--- a/x11/randrext/pkg-plist
+++ b/x11/randrext/pkg-plist
@@ -3,4 +3,4 @@ include/X11/extensions/randrproto.h
libdata/pkgconfig/randr.pc
%%DOCSDIR%%/protocol
@dirrm %%DOCSDIR%%
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/renderext/Makefile b/x11/renderext/Makefile
index 4ef86b0c7e80..ca4b5a2b099b 100644
--- a/x11/renderext/Makefile
+++ b/x11/renderext/Makefile
@@ -23,12 +23,4 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= 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/renderext/pkg-plist b/x11/renderext/pkg-plist
index 3aa1fa5a134e..f751a38b9f0d 100644
--- a/x11/renderext/pkg-plist
+++ b/x11/renderext/pkg-plist
@@ -4,4 +4,4 @@ libdata/pkgconfig/render.pc
%%DOCSDIR%%/library
%%DOCSDIR%%/protocol
@dirrm %%DOCSDIR%%
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/resourceext/Makefile b/x11/resourceext/Makefile
index c82986ec7468..7cfa50a222e8 100644
--- a/x11/resourceext/Makefile
+++ b/x11/resourceext/Makefile
@@ -24,12 +24,4 @@ USE_GMAKE= yes
NO_BUILD= yes
USE_GNOME= gnomehack
-.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/resourceext/pkg-plist b/x11/resourceext/pkg-plist
index c799fc83f252..2fe2fddaa2de 100644
--- a/x11/resourceext/pkg-plist
+++ b/x11/resourceext/pkg-plist
@@ -1,3 +1,3 @@
include/X11/extensions/XResproto.h
libdata/pkgconfig/resourceext.pc
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/xextensions/Makefile b/x11/xextensions/Makefile
index 10de5b88c80b..3907fdea0c03 100644
--- a/x11/xextensions/Makefile
+++ b/x11/xextensions/Makefile
@@ -26,12 +26,4 @@ USE_GMAKE= yes
NO_BUILD= yes
USE_GNOME= gnomehack
-.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/xextensions/pkg-plist b/x11/xextensions/pkg-plist
index 98bfc8c3fd5e..37714321fd51 100644
--- a/x11/xextensions/pkg-plist
+++ b/x11/xextensions/pkg-plist
@@ -52,4 +52,4 @@ include/X11/extensions/xtestext1.h
include/X11/extensions/xteststr.h
libdata/pkgconfig/xextensions.pc
@dirrm share/doc/xextensions
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 9d4204eee5e9..0f2bc1825c90 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -27,12 +27,4 @@ CONFIGURE_ARGS= --with-xkb-base=${X11BASE}/lib/X11/xkb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-.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/xfree86_xkb_xml/pkg-plist b/x11/xfree86_xkb_xml/pkg-plist
index e31f5ca63962..78ef562c8655 100644
--- a/x11/xfree86_xkb_xml/pkg-plist
+++ b/x11/xfree86_xkb_xml/pkg-plist
@@ -2,5 +2,5 @@ lib/X11/xkb/rules/xfree86.xml
lib/X11/xkb/rules/xkb.dtd
share/locale/bg/LC_MESSAGES/xfree86_xkb_xml.mo
share/locale/ru/LC_MESSAGES/xfree86_xkb_xml.mo
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-28 21:01:39 +0000