Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F161055662
D37927.id114700.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D37927.id114700.diff
View Options
Index: net/tigervnc-server/Makefile
===================================================================
--- net/tigervnc-server/Makefile
+++ net/tigervnc-server/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 5
+PORTREVISION= 6
PKGNAMESUFFIX= -server
COMMENT= TigerVNC Server
@@ -39,14 +39,13 @@
PAM_CMAKE_BOOL= ENABLE_PAM
CONFIGURE_ARGS+= \
- --prefix=${PREFIX} --mandir=${PREFIX}/share/man/ \
+ --prefix=${PREFIX} --mandir=${MANPREFIX}/share/man \
--docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \
--disable-static --disable-dri --disable-unit-tests \
--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
--disable-config-dbus --disable-config-hal \
--disable-dri2 --enable-install-libxf86config --enable-glx \
- --with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \
--with-xkb-path=${LOCALBASE}/share/X11/xkb \
--with-xkb-bin-directory=${LOCALBASE}/bin \
--with-serverconfig-path=${LOCALBASE}/lib/X11 \
@@ -54,6 +53,19 @@
--disable-xwayland \
--with-fontrootdir=${LOCALBASE}/share/fonts
+FONTPATH_ROOT?= ${LOCALBASE}/share/fonts
+FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d
+DEFAULT_FONTPATH_LIST= \
+ ${FONTPATH_ROOT}/misc/ \
+ ${FONTPATH_ROOT}/TTF/ \
+ ${FONTPATH_ROOT}/OTF/ \
+ ${FONTPATH_ROOT}/Type1/ \
+ ${FONTPATH_ROOT}/100dpi/ \
+ ${FONTPATH_ROOT}/75dpi/ \
+ catalogue:${FONTPATHD}
+CONFIGURE_ARGS+= --with-default-font-path="${DEFAULT_FONTPATH_LIST:ts,}"
+PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}"
+
CFLAGS+= -I${LOCALBASE}/include/libdrm
# This is server port, disabling some features
@@ -77,11 +89,12 @@
@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS}
post-build:
- @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash
+ @cd ${WRKSRC}/unix/xserver/ && \
+ ${DO_MAKE_BUILD} SHELL=${LOCALBASE}/bin/bash ${ALL_TARGET}
post-install:
- @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so
+ @cd ${WRKSRC}/unix/xserver/hw/vnc/ && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-strip
@${INSTALL_SCRIPT} ${FILESDIR}/vncserver.ports ${STAGEDIR}${PREFIX}/bin/vncserver
.include "${.CURDIR}/Makefile.common.mk"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Jul 1, 4:44 AM (16 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34542588
Default Alt Text
D37927.id114700.diff (2 KB)
Attached To
Mode
D37927: net/tigervnc-server: Use the same default fp for Xvnc as xorg-server
Attached
Detach File
Event Timeline
Log In to Comment