diff --git a/x11/Makefile b/x11/Makefile index 7ec94c17f581..2b62f0380cd5 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,587 +1,588 @@ COMMENT = Ports to support the X window system SUBDIR += 3ddesktop SUBDIR += 9box SUBDIR += 9menu SUBDIR += aclip SUBDIR += admiral SUBDIR += alacritty SUBDIR += albert SUBDIR += alttab SUBDIR += aminal SUBDIR += antimicro SUBDIR += appmenu-registrar SUBDIR += appres SUBDIR += apwal SUBDIR += arandr SUBDIR += arcan-trayicon SUBDIR += aterm SUBDIR += autorandr SUBDIR += babl SUBDIR += bbappconf SUBDIR += bbdock SUBDIR += bbrun SUBDIR += beforelight SUBDIR += bemenu SUBDIR += bgrot SUBDIR += bgs SUBDIR += bitmap SUBDIR += bmpanel2 SUBDIR += brisk-menu SUBDIR += cde + SUBDIR += cde-24 SUBDIR += cinnamon SUBDIR += cinnamon-desktop SUBDIR += cinnamon-menus SUBDIR += cinnamon-screensaver SUBDIR += cinnamon-session SUBDIR += cl-clx SUBDIR += cl-clx-sbcl SUBDIR += clipman SUBDIR += compton-conf SUBDIR += conlecterm SUBDIR += controllermap SUBDIR += cool-retro-term SUBDIR += coreterminal SUBDIR += deforaos-desktop SUBDIR += deforaos-keyboard SUBDIR += deforaos-libdesktop SUBDIR += deforaos-locker SUBDIR += deforaos-panel SUBDIR += deskmenu SUBDIR += disman SUBDIR += dmenu SUBDIR += docker-tray SUBDIR += dsbautostart SUBDIR += dsbxinput SUBDIR += dwmblocks SUBDIR += dxpc SUBDIR += dzen2 SUBDIR += eaglemode SUBDIR += editres SUBDIR += elementary-terminal SUBDIR += emprint SUBDIR += erun SUBDIR += eterm SUBDIR += evilvte SUBDIR += evtest SUBDIR += fbdesk SUBDIR += fbpanel SUBDIR += find-cursor SUBDIR += fireflies SUBDIR += florence SUBDIR += flruler SUBDIR += fnott SUBDIR += foot SUBDIR += fpc-x11 SUBDIR += fstobdf SUBDIR += fuzzel SUBDIR += gdm SUBDIR += glcapsviewer SUBDIR += gmrun SUBDIR += gnome SUBDIR += gnome-clipboard-daemon SUBDIR += gnome-console SUBDIR += gnome-desktop SUBDIR += gnome-menus SUBDIR += gnome-pie SUBDIR += gnome-session SUBDIR += gnome-shell SUBDIR += gnome-shell-extensions SUBDIR += gnome-terminal SUBDIR += gnustep-app SUBDIR += grabc SUBDIR += grim SUBDIR += gromit SUBDIR += gromit-mpx SUBDIR += gskrab SUBDIR += gstreamer1-plugins-x SUBDIR += gstreamer1-plugins-ximagesrc SUBDIR += gtk-app-menu SUBDIR += gtk-theme-switch2 SUBDIR += gtkchtheme SUBDIR += gtkterm2 SUBDIR += guake SUBDIR += gxkb SUBDIR += hamclock SUBDIR += hhpc SUBDIR += hs-xmobar SUBDIR += hsetroot SUBDIR += i3blocks SUBDIR += i3lock-color SUBDIR += iceauth SUBDIR += ico SUBDIR += idesk SUBDIR += imwheel SUBDIR += innerspace SUBDIR += inputplug SUBDIR += j4-dmenu-desktop SUBDIR += jgmenu SUBDIR += kanshi SUBDIR += kb2mb2 SUBDIR += kde-baseapps SUBDIR += kde5 SUBDIR += kdisplay SUBDIR += keybinder SUBDIR += keybinder-gtk3 SUBDIR += keyboardcast SUBDIR += keynav SUBDIR += kf5-frameworkintegration SUBDIR += kf5-frameworks SUBDIR += kf5-kactivities SUBDIR += kf5-kactivities-stats SUBDIR += kf5-kded SUBDIR += kf5-kdelibs4support SUBDIR += kf5-kglobalaccel SUBDIR += kf5-kinit SUBDIR += kf5-krunner SUBDIR += kf5-kwayland SUBDIR += kf5-kwindowsystem SUBDIR += kf5-plasma-framework SUBDIR += kickoff SUBDIR += kitty SUBDIR += konsole SUBDIR += lavalauncher SUBDIR += lemonbar SUBDIR += lemonbar-xft SUBDIR += libICE SUBDIR += libSM SUBDIR += libX11 SUBDIR += libXScrnSaver SUBDIR += libXau SUBDIR += libXcm SUBDIR += libXcomposite SUBDIR += libXcursor SUBDIR += libXdamage SUBDIR += libXdmcp SUBDIR += libXext SUBDIR += libXfixes SUBDIR += libXi SUBDIR += libXinerama SUBDIR += libXpm SUBDIR += libXpresent SUBDIR += libXrandr SUBDIR += libXrender SUBDIR += libXres SUBDIR += libXtst SUBDIR += libXv SUBDIR += libXvMC SUBDIR += libXxf86dga SUBDIR += libXxf86vm SUBDIR += libdmx SUBDIR += libexo SUBDIR += libfakekey SUBDIR += libfm SUBDIR += libfm-extra SUBDIR += libfm-qt SUBDIR += libgnomekbd SUBDIR += libinput SUBDIR += libmatekbd SUBDIR += libsx SUBDIR += libsynaptics SUBDIR += libwacom SUBDIR += libxcb SUBDIR += libxcvt SUBDIR += libxdg-basedir SUBDIR += libxfce4menu SUBDIR += libxfce4util SUBDIR += libxkbcommon SUBDIR += libxkbfile SUBDIR += libxklavier SUBDIR += libxshmfence SUBDIR += lightdm SUBDIR += lightdm-gtk-greeter SUBDIR += lightdm-gtk-greeter-settings SUBDIR += lilyterm SUBDIR += linux-c7-libxkbcommon SUBDIR += linux-c7-pixman SUBDIR += linux-c7-xcb-util SUBDIR += linux-c7-xcb-util-image SUBDIR += linux-c7-xcb-util-keysyms SUBDIR += linux-c7-xorg-libs SUBDIR += linux-nvidia-libs SUBDIR += linux-nvidia-libs-304 SUBDIR += linux-nvidia-libs-340 SUBDIR += linux-nvidia-libs-390 SUBDIR += linux-nvidia-libs-470 SUBDIR += listres SUBDIR += lsw SUBDIR += luit SUBDIR += lumina SUBDIR += lumina-core SUBDIR += lumina-coreutils SUBDIR += lupe SUBDIR += lxde-meta SUBDIR += lxhotkey SUBDIR += lxmenu-data SUBDIR += lxpanel SUBDIR += lxqt-about SUBDIR += lxqt-globalkeys SUBDIR += lxqt-runner SUBDIR += lxrandr SUBDIR += ly SUBDIR += mako SUBDIR += mate SUBDIR += mate-applet-appmenu SUBDIR += mate-applets SUBDIR += mate-base SUBDIR += mate-desktop SUBDIR += mate-dock-applet SUBDIR += mate-menus SUBDIR += mate-panel SUBDIR += mate-screensaver SUBDIR += mate-session-manager SUBDIR += mate-terminal SUBDIR += menu-cache SUBDIR += menulibre SUBDIR += metalock SUBDIR += mkcomposecache SUBDIR += mlterm SUBDIR += mons SUBDIR += mrxvt SUBDIR += mrxvt-devel SUBDIR += multi-aterm SUBDIR += mxascii SUBDIR += mxico SUBDIR += nezd SUBDIR += nfy SUBDIR += numlockx SUBDIR += nvidia-driver SUBDIR += nvidia-driver-304 SUBDIR += nvidia-driver-340 SUBDIR += nvidia-driver-390 SUBDIR += nvidia-driver-470 SUBDIR += nvidia-hybrid-graphics SUBDIR += nvidia-secondary-driver SUBDIR += nvidia-secondary-driver-390 SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nwg-bar SUBDIR += nwg-dock SUBDIR += nwg-drawer SUBDIR += nwg-launchers SUBDIR += nwg-look SUBDIR += nwg-menu SUBDIR += nxcomp SUBDIR += p5-Clipboard SUBDIR += p5-X11-GUITest SUBDIR += p5-X11-IdleTime SUBDIR += p5-X11-Protocol SUBDIR += p5-X11-Protocol-Other SUBDIR += p5-X11-Resolution SUBDIR += p5-X11-XCB SUBDIR += p5-X11-Xlib SUBDIR += p5-XTerm-Conf SUBDIR += pcdm SUBDIR += perwindowlayoutd SUBDIR += pipeglade SUBDIR += pixman SUBDIR += plank SUBDIR += plasma-wayland-protocols SUBDIR += plasma5-kactivitymanagerd SUBDIR += plasma5-kgamma5 SUBDIR += plasma5-kscreen SUBDIR += plasma5-kwayland-integration SUBDIR += plasma5-kwayland-server SUBDIR += plasma5-layer-shell-qt SUBDIR += plasma5-libkscreen SUBDIR += plasma5-plasma SUBDIR += plasma5-plasma-desktop SUBDIR += plasma5-plasma-integration SUBDIR += plasma5-plasma-workspace SUBDIR += pmenu SUBDIR += polybar SUBDIR += printscreen SUBDIR += py-caffeine-ng SUBDIR += py-i3-quickterm SUBDIR += py-i3ipc SUBDIR += py-pyscreenshot SUBDIR += py-python-xapp SUBDIR += py-pyvirtualdisplay SUBDIR += py-xcffib SUBDIR += py-xdot SUBDIR += qimageblitz SUBDIR += qt5-qev SUBDIR += qt5-x11extras SUBDIR += qterminal SUBDIR += radare-cutter SUBDIR += remontoire SUBDIR += rendercheck SUBDIR += rgb SUBDIR += rofi SUBDIR += rofi-calc SUBDIR += rofi-pass SUBDIR += rofi-wayland SUBDIR += roxterm SUBDIR += rsibreak SUBDIR += rubygem-gnome SUBDIR += runner SUBDIR += rxvt-unicode SUBDIR += sakura SUBDIR += sbxkb SUBDIR += screen-message SUBDIR += screengrab SUBDIR += screenkey SUBDIR += scripts SUBDIR += sddm SUBDIR += sdwmbar SUBDIR += sessreg SUBDIR += setlayout SUBDIR += setxkbmap SUBDIR += showkeys SUBDIR += showmethekey SUBDIR += simplestroke SUBDIR += sirula SUBDIR += slick-greeter SUBDIR += slim SUBDIR += slock SUBDIR += slop SUBDIR += slurp SUBDIR += smproxy SUBDIR += sprop SUBDIR += squeekboard SUBDIR += srandrd SUBDIR += sselp SUBDIR += stalonetray SUBDIR += startup-notification SUBDIR += sterm SUBDIR += stjerm SUBDIR += swarp SUBDIR += sway-audio-idle-inhibit SUBDIR += swaybg SUBDIR += swayfloatingswitcher SUBDIR += swayidle SUBDIR += swayimg SUBDIR += swaylock SUBDIR += swaylock-effects SUBDIR += swaync SUBDIR += swayr SUBDIR += swaysettings SUBDIR += sxhkd SUBDIR += sxpc SUBDIR += tabbed SUBDIR += taiga SUBDIR += temperature.app SUBDIR += terminal.app SUBDIR += terminator SUBDIR += terminology SUBDIR += thinglaunch SUBDIR += thingylaunch SUBDIR += tilda SUBDIR += tilix SUBDIR += tint SUBDIR += trayer SUBDIR += ulauncher SUBDIR += urxvt-font-size SUBDIR += urxvt-perls SUBDIR += vdesk SUBDIR += viewres SUBDIR += virglrenderer SUBDIR += virtboard SUBDIR += virtualgl SUBDIR += wallutils SUBDIR += wapanel SUBDIR += way-displays SUBDIR += waybar SUBDIR += wayland-logout SUBDIR += wayout SUBDIR += wbar SUBDIR += wcm SUBDIR += wdisplays SUBDIR += wdm SUBDIR += wev SUBDIR += wezterm SUBDIR += wf-shell SUBDIR += wl-clipboard SUBDIR += wl-mirror SUBDIR += wlogout SUBDIR += wlr-randr SUBDIR += wlrctl SUBDIR += wmappl SUBDIR += wmblob SUBDIR += wmbutton SUBDIR += wmcliphist SUBDIR += wmctrl SUBDIR += wmdrawer SUBDIR += wmfocus SUBDIR += wmsystemtray SUBDIR += wmutils-core SUBDIR += wmutils-opt SUBDIR += wob SUBDIR += wofi SUBDIR += workrave SUBDIR += wshowkeys SUBDIR += wtype SUBDIR += wvkbd SUBDIR += x-on-resize SUBDIR += x11perf SUBDIR += x3270 SUBDIR += xantfarm SUBDIR += xapp SUBDIR += xascii SUBDIR += xauth SUBDIR += xautolock SUBDIR += xautomation SUBDIR += xbacklight SUBDIR += xballoon SUBDIR += xbanish SUBDIR += xbiff SUBDIR += xbindkeys SUBDIR += xbitmaps SUBDIR += xbrightness SUBDIR += xcalc SUBDIR += xcalib SUBDIR += xcape SUBDIR += xcb SUBDIR += xcb-imdkit SUBDIR += xcb-proto SUBDIR += xcb-util SUBDIR += xcb-util-cursor SUBDIR += xcb-util-errors SUBDIR += xcb-util-image SUBDIR += xcb-util-keysyms SUBDIR += xcb-util-renderutil SUBDIR += xcb-util-wm SUBDIR += xcb-util-xrm SUBDIR += xclickroot SUBDIR += xclip SUBDIR += xclipboard SUBDIR += xcm SUBDIR += xcmd SUBDIR += xcmsdb SUBDIR += xcoloredit SUBDIR += xcolors SUBDIR += xconsole SUBDIR += xcursorgen SUBDIR += xcut SUBDIR += xdg-desktop-portal-wlr SUBDIR += xdialog SUBDIR += xditview SUBDIR += xdm SUBDIR += xdo SUBDIR += xdotool SUBDIR += xdpyinfo SUBDIR += xdriinfo SUBDIR += xdtm SUBDIR += xedit SUBDIR += xev SUBDIR += xeyes SUBDIR += xf86dga SUBDIR += xfce4-appmenu-plugin SUBDIR += xfce4-clipman-plugin SUBDIR += xfce4-conf SUBDIR += xfce4-dashboard SUBDIR += xfce4-docklike-plugin SUBDIR += xfce4-goodies SUBDIR += xfce4-screensaver SUBDIR += xfce4-screenshooter-plugin SUBDIR += xfce4-taskmanager SUBDIR += xfce4-terminal SUBDIR += xfce4-verve-plugin SUBDIR += xfce4-whiskermenu-plugin SUBDIR += xfd SUBDIR += xfishtank SUBDIR += xforward SUBDIR += xgamma SUBDIR += xgc SUBDIR += xhost SUBDIR += xidle SUBDIR += xinit SUBDIR += xinput SUBDIR += xkb-switch SUBDIR += xkbcomp SUBDIR += xkbctrl SUBDIR += xkbevd SUBDIR += xkbind SUBDIR += xkbprint SUBDIR += xkbset SUBDIR += xkbutils SUBDIR += xkeyboard-config SUBDIR += xkeycaps SUBDIR += xkeywrap SUBDIR += xkill SUBDIR += xload SUBDIR += xloadimage SUBDIR += xlockmore SUBDIR += xlogo SUBDIR += xlsatoms SUBDIR += xlsclients SUBDIR += xmag SUBDIR += xman SUBDIR += xmangekyou SUBDIR += xmascot SUBDIR += xmenu SUBDIR += xmessage SUBDIR += xmh SUBDIR += xmodmap SUBDIR += xmore SUBDIR += xmotd SUBDIR += xmsg SUBDIR += xmx SUBDIR += xnee SUBDIR += xnotify SUBDIR += xob SUBDIR += xorg SUBDIR += xorg-apps SUBDIR += xorg-cf-files SUBDIR += xorg-docs SUBDIR += xorg-libraries SUBDIR += xorg-minimal SUBDIR += xorgproto SUBDIR += xpr SUBDIR += xpra SUBDIR += xpra-html5 SUBDIR += xprintidle SUBDIR += xprompt SUBDIR += xprop SUBDIR += xrandr SUBDIR += xrdb SUBDIR += xrefresh SUBDIR += xrestop SUBDIR += xrootconsole SUBDIR += xrsh SUBDIR += xrsi SUBDIR += xscope SUBDIR += xscreensaver SUBDIR += xscreensaver.app SUBDIR += xsel-conrad SUBDIR += xset SUBDIR += xsetroot SUBDIR += xsettingsd SUBDIR += xskyroot SUBDIR += xsm SUBDIR += xsnow SUBDIR += xssstate SUBDIR += xstarroll SUBDIR += xstdcmap SUBDIR += xstroke SUBDIR += xtacy SUBDIR += xterm SUBDIR += xtermcontrol SUBDIR += xtermset SUBDIR += xtestpicture SUBDIR += xtitle SUBDIR += xtoolwait SUBDIR += xtrans SUBDIR += xtrlock SUBDIR += xtset SUBDIR += xvidtune SUBDIR += xvinfo SUBDIR += xvkbd SUBDIR += xvmcinfo SUBDIR += xvt SUBDIR += xwatchwin SUBDIR += xwd SUBDIR += xwininfo SUBDIR += xwinwrap SUBDIR += xwit SUBDIR += xwud SUBDIR += xxkb SUBDIR += xzoom SUBDIR += yad SUBDIR += yakuake SUBDIR += yalias SUBDIR += yeahconsole SUBDIR += yelp SUBDIR += zenity .include diff --git a/x11/cde/Makefile b/x11/cde-24/Makefile similarity index 97% copy from x11/cde/Makefile copy to x11/cde-24/Makefile index c7c9b65ba024..1ef3415e9081 100644 --- a/x11/cde/Makefile +++ b/x11/cde-24/Makefile @@ -1,122 +1,128 @@ PORTNAME= cde DISTVERSION= 2.4.0 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ +.if !defined(MASTERDIR) +PKGNAMESUFFIX= -24 +.endif MAINTAINER= cy@FreeBSD.org COMMENT= Common Desktop Environment LICENSE= LGPL21 BROKEN_mips64= fails to build: ./config/imake/imake: No such file or directory BROKEN_powerpc64= fails to build: ./config/imake/imake: No such file or directory BROKEN_i386= cannot bind to a temporary of type va_list BUILD_DEPENDS= ksh93:shells/ksh93 \ bdftopcf:x11-fonts/bdftopcf \ mkfontscale>=0:x11-fonts/mkfontscale \ biconv:converters/iconv \ ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 RUN_DEPENDS= ksh93:shells/ksh93 \ ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig \ ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \ xrdb:x11/xrdb \ xset:x11/xset USES= iconv:wchar_t jpeg motif perl5 shebangfix tcl:86 xorg SHEBANG_LANG= pl SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate \ programs/dtdocbook/doc2sdl/docbook.tcl \ programs/dtdocbook/doc2sdl/dtdocbook USE_LDCONFIG= ${PREFIX}/dt/lib USE_RC_SUBR= dtcms dtlogin USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} ALL_TARGET= World MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" MAKE_JOBS_UNSAFE=yes MAKE_ENV= MALLOC_CONF=junk:false SUB_FILES= pkg-message LDFLAGS+= -z muldefs #--allow-multiple-definition post-patch: @if [ -f /usr/include/iconv.h ]; then \ ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \ ${WRKSRC}/programs/dtmail/libDtMail/Common/Session.C \ ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCBodyPart.C; \ fi # From shells/ksh93 @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/include/sfio*.h \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.c \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.h # Speed up poudriere + qemu + native-xtools @${REINPLACE_CMD} \ -e 's|CcCmd cc|CcCmd ${CC}|g' \ -e 's|CplusplusCmd c++|CplusplusCmd ${CXX}|g' \ -e 's|CppCmd /usr/bin/cpp|CppCmd ${CPP}|g' \ ${WRKSRC}/config/cf/FreeBSD.cf # Needed for armv6 @${REINPLACE_CMD} -e 's|__va_copy|va_copy|g' \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/hash/*.c \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.c \ ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/string/*.c # Fix all hardcoded path @${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ ${WRKSRC}/config/cf/Imake.tmpl \ ${WRKSRC}/programs/dtinfo/tools/bin/ccdate @${REINPLACE_CMD} -e 's|/bin/ksh|${LOCALBASE}/bin/ksh93|g' \ ${WRKSRC}/programs/dtopen/dtopen.src @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/dt|${LOCALBASE}/dt|g ; \ s|/etc/dt|${LOCALBASE}/etc/dt|g' @${REINPLACE_CMD} -e 's|STAGEDIR|${STAGEDIR}|g' -e \ 's|LOCALBASE|${LOCALBASE}|g' \ ${WRKSRC}/admin/IntegTools/dbTools/installCDE.src \ ${WRKSRC}/admin/IntegTools/post_install/freebsd/configRun.src \ ${WRKSRC}/admin/IntegTools/post_install/freebsd/configShlibs.src \ ${WRKSRC}/admin/IntegTools/post_install/freebsd/configMin.src # we need to remove a few LOCALBASE @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtinfogen|/etc/dtinfogen|g' \ ${WRKSRC}/databases/CDE-RUN.src \ ${WRKSRC}/config/cf/cde.tmpl @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtsr|/etc/dtsr|g' -e \ 's|${LOCALBASE}/etc/dtinfo_start|/etc/dtinfo_start|g' \ ${WRKSRC}/databases/CDE-RUN.src \ ${WRKSRC}/programs/tttypes/dtinfo_start.ptype \ ${WRKSRC}/programs/tttypes/dtinfo.ptype @${REINPLACE_CMD} -e 's|${LOCALBASE}||g' \ ${WRKSRC}/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c # why redefine exit?? @${REINPLACE_CMD} -e '/void exit/d' \ ${WRKSRC}/lib/tt/bin/tt_type_comp/frozen.mp_types_lex.C # (time_t*) NULL is apparently too C-ish @${REINPLACE_CMD} -e 's,(time_t) *NULL,nullptr,' \ ${WRKSRC}/programs/dtmail/libDtMail/Common/FileShare.C \ ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCMailBox.C do-install: cd ${WRKSRC}/admin/IntegTools/dbTools && \ ./installCDE -s ${WRKSRC} -destdir ${STAGEDIR} (cd ${STAGEDIR}${PREFIX}/dt/share/man && \ for m in 1 1m 3 4 5 6; do \ ${GZIP_CMD} man$$m/*.$$m; \ done) ${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf \ ${STAGEDIR}${PREFIX}/etc/pam.d/cde.conf post-install: ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; # Only a problem on armv7 so far ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete +.if !defined(MASTERDIR) + ${RM} ${STAGEDIR}/${PREFIX}/libdata/ldconfig/cde +.endif .include diff --git a/x11/cde/distinfo b/x11/cde-24/distinfo similarity index 100% rename from x11/cde/distinfo rename to x11/cde-24/distinfo diff --git a/x11/cde/files/dtcms.in b/x11/cde-24/files/dtcms.in similarity index 100% rename from x11/cde/files/dtcms.in rename to x11/cde-24/files/dtcms.in diff --git a/x11/cde/files/dtlogin.in b/x11/cde-24/files/dtlogin.in similarity index 100% rename from x11/cde/files/dtlogin.in rename to x11/cde-24/files/dtlogin.in diff --git a/x11/cde/files/patch-Makefile b/x11/cde-24/files/patch-Makefile similarity index 100% rename from x11/cde/files/patch-Makefile rename to x11/cde-24/files/patch-Makefile diff --git a/x11/cde/files/patch-admin_IntegTools_dbTools_installCDE b/x11/cde-24/files/patch-admin_IntegTools_dbTools_installCDE similarity index 100% rename from x11/cde/files/patch-admin_IntegTools_dbTools_installCDE rename to x11/cde-24/files/patch-admin_IntegTools_dbTools_installCDE diff --git a/x11/cde/files/patch-admin_IntegTools_post__install_freebsd_configMin.src b/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configMin.src similarity index 100% rename from x11/cde/files/patch-admin_IntegTools_post__install_freebsd_configMin.src rename to x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configMin.src diff --git a/x11/cde/files/patch-admin_IntegTools_post__install_freebsd_configRun.src b/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configRun.src similarity index 100% rename from x11/cde/files/patch-admin_IntegTools_post__install_freebsd_configRun.src rename to x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configRun.src diff --git a/x11/cde/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src b/x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src similarity index 100% rename from x11/cde/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src rename to x11/cde-24/files/patch-admin_IntegTools_post__install_freebsd_configShlibs.src diff --git a/x11/cde/files/patch-config_cf_Imake.cf b/x11/cde-24/files/patch-config_cf_Imake.cf similarity index 100% rename from x11/cde/files/patch-config_cf_Imake.cf rename to x11/cde-24/files/patch-config_cf_Imake.cf diff --git a/x11/cde/files/patch-config_cf_Imake.rules b/x11/cde-24/files/patch-config_cf_Imake.rules similarity index 100% rename from x11/cde/files/patch-config_cf_Imake.rules rename to x11/cde-24/files/patch-config_cf_Imake.rules diff --git a/x11/cde/files/patch-lib_DtHelp_Imakefile b/x11/cde-24/files/patch-lib_DtHelp_Imakefile similarity index 100% rename from x11/cde/files/patch-lib_DtHelp_Imakefile rename to x11/cde-24/files/patch-lib_DtHelp_Imakefile diff --git a/x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c b/x11/cde-24/files/patch-programs_dtcm_dtcm_calendarA.c similarity index 100% rename from x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c rename to x11/cde-24/files/patch-programs_dtcm_dtcm_calendarA.c diff --git a/x11/cde/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h similarity index 100% rename from x11/cde/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h rename to x11/cde-24/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h diff --git a/x11/cde/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C similarity index 100% rename from x11/cde/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C rename to x11/cde-24/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C diff --git a/x11/cde/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h similarity index 100% rename from x11/cde/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h rename to x11/cde-24/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h diff --git a/x11/cde/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C b/x11/cde-24/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C similarity index 100% rename from x11/cde/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C rename to x11/cde-24/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c b/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c similarity index 100% rename from x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c rename to x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c b/x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c similarity index 100% rename from x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c rename to x11/cde-24/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c diff --git a/x11/cde/files/pkg-message.in b/x11/cde-24/files/pkg-message.in similarity index 100% rename from x11/cde/files/pkg-message.in rename to x11/cde-24/files/pkg-message.in diff --git a/x11/cde/pkg-descr b/x11/cde-24/pkg-descr similarity index 100% rename from x11/cde/pkg-descr rename to x11/cde-24/pkg-descr diff --git a/x11/cde/pkg-plist b/x11/cde-24/pkg-plist similarity index 100% rename from x11/cde/pkg-plist rename to x11/cde-24/pkg-plist diff --git a/x11/cde/Makefile b/x11/cde/Makefile index c7c9b65ba024..bc0405b81bff 100644 --- a/x11/cde/Makefile +++ b/x11/cde/Makefile @@ -1,122 +1,8 @@ -PORTNAME= cde -DISTVERSION= 2.4.0 -CATEGORIES= x11 -MASTER_SITES= SF/cdesktopenv/src/ +VERSIONS= 24 +# The reason we will keep our main CDE metaport at 2.4.3 is to +# avoid a POLA violation due to font differences. +CDE_VERSION?= 24 -MAINTAINER= cy@FreeBSD.org -COMMENT= Common Desktop Environment +MASTERDIR= ${.CURDIR}/../cde-${CDE_VERSION} -LICENSE= LGPL21 - -BROKEN_mips64= fails to build: ./config/imake/imake: No such file or directory -BROKEN_powerpc64= fails to build: ./config/imake/imake: No such file or directory -BROKEN_i386= cannot bind to a temporary of type va_list - -BUILD_DEPENDS= ksh93:shells/ksh93 \ - bdftopcf:x11-fonts/bdftopcf \ - mkfontscale>=0:x11-fonts/mkfontscale \ - biconv:converters/iconv \ - ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ - ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 -RUN_DEPENDS= ksh93:shells/ksh93 \ - ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig \ - ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2 \ - xrdb:x11/xrdb \ - xset:x11/xset - -USES= iconv:wchar_t jpeg motif perl5 shebangfix tcl:86 xorg -SHEBANG_LANG= pl -SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate \ - programs/dtdocbook/doc2sdl/docbook.tcl \ - programs/dtdocbook/doc2sdl/dtdocbook -USE_LDCONFIG= ${PREFIX}/dt/lib -USE_RC_SUBR= dtcms dtlogin -USE_XORG= ice sm x11 xau xdmcp xext xinerama xmu xscrnsaver xt - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -ALL_TARGET= World -MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" -MAKE_JOBS_UNSAFE=yes -MAKE_ENV= MALLOC_CONF=junk:false -SUB_FILES= pkg-message -LDFLAGS+= -z muldefs #--allow-multiple-definition - -post-patch: - @if [ -f /usr/include/iconv.h ]; then \ - ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \ - ${WRKSRC}/programs/dtmail/libDtMail/Common/Session.C \ - ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCBodyPart.C; \ - fi - -# From shells/ksh93 - @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \ - ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/include/sfio*.h \ - ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.c \ - ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.h - -# Speed up poudriere + qemu + native-xtools - @${REINPLACE_CMD} \ - -e 's|CcCmd cc|CcCmd ${CC}|g' \ - -e 's|CplusplusCmd c++|CplusplusCmd ${CXX}|g' \ - -e 's|CppCmd /usr/bin/cpp|CppCmd ${CPP}|g' \ - ${WRKSRC}/config/cf/FreeBSD.cf - -# Needed for armv6 - @${REINPLACE_CMD} -e 's|__va_copy|va_copy|g' \ - ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/hash/*.c \ - ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/sfio/*.c \ - ${WRKSRC}/programs/dtksh/ksh93/src/lib/libast/string/*.c - -# Fix all hardcoded path - @${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ - ${WRKSRC}/config/cf/Imake.tmpl \ - ${WRKSRC}/programs/dtinfo/tools/bin/ccdate - @${REINPLACE_CMD} -e 's|/bin/ksh|${LOCALBASE}/bin/ksh93|g' \ - ${WRKSRC}/programs/dtopen/dtopen.src - @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ - 's|/usr/dt|${LOCALBASE}/dt|g ; \ - s|/etc/dt|${LOCALBASE}/etc/dt|g' - - @${REINPLACE_CMD} -e 's|STAGEDIR|${STAGEDIR}|g' -e \ - 's|LOCALBASE|${LOCALBASE}|g' \ - ${WRKSRC}/admin/IntegTools/dbTools/installCDE.src \ - ${WRKSRC}/admin/IntegTools/post_install/freebsd/configRun.src \ - ${WRKSRC}/admin/IntegTools/post_install/freebsd/configShlibs.src \ - ${WRKSRC}/admin/IntegTools/post_install/freebsd/configMin.src - -# we need to remove a few LOCALBASE - @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtinfogen|/etc/dtinfogen|g' \ - ${WRKSRC}/databases/CDE-RUN.src \ - ${WRKSRC}/config/cf/cde.tmpl - @${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtsr|/etc/dtsr|g' -e \ - 's|${LOCALBASE}/etc/dtinfo_start|/etc/dtinfo_start|g' \ - ${WRKSRC}/databases/CDE-RUN.src \ - ${WRKSRC}/programs/tttypes/dtinfo_start.ptype \ - ${WRKSRC}/programs/tttypes/dtinfo.ptype - @${REINPLACE_CMD} -e 's|${LOCALBASE}||g' \ - ${WRKSRC}/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c - -# why redefine exit?? - @${REINPLACE_CMD} -e '/void exit/d' \ - ${WRKSRC}/lib/tt/bin/tt_type_comp/frozen.mp_types_lex.C -# (time_t*) NULL is apparently too C-ish - @${REINPLACE_CMD} -e 's,(time_t) *NULL,nullptr,' \ - ${WRKSRC}/programs/dtmail/libDtMail/Common/FileShare.C \ - ${WRKSRC}/programs/dtmail/libDtMail/RFC/RFCMailBox.C - -do-install: - cd ${WRKSRC}/admin/IntegTools/dbTools && \ - ./installCDE -s ${WRKSRC} -destdir ${STAGEDIR} - (cd ${STAGEDIR}${PREFIX}/dt/share/man && \ - for m in 1 1m 3 4 5 6; do \ - ${GZIP_CMD} man$$m/*.$$m; \ - done) - ${INSTALL_DATA} ${WRKSRC}/lib/pam/libpam/pam.conf \ - ${STAGEDIR}${PREFIX}/etc/pam.d/cde.conf - -post-install: - ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; - # Only a problem on armv7 so far - ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete - -.include +.include "${MASTERDIR}/Makefile"