From 0e1763099cf9eddcc03467fc374535ac728ed15e Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 19 Apr 2011 20:01:48 -0700 Subject: [PATCH] release - remove xchat from gui build * xchat has build problems, remove it --- nrelease/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nrelease/Makefile b/nrelease/Makefile index 7ac5c075e3..bf45db292e 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -114,11 +114,18 @@ ROOTSKELS?= ${REQ_ROOTSKELS} ISOFILE?= ${ISODIR}/dfly-gui.iso IMGFILE?= ${ISODIR}/dfly-gui.img +# NOTE: order important, do not sort package list +# +# Apps we want in the gui build but which have problems building: +# chat/xchat link error on x86-64, something about ___progname +# +# .if !make(nopkgs) -PKGSRC_PACKAGES+= meta-pkgs/modular-xorg-apps \ - meta-pkgs/modular-xorg-drivers \ +PKGSRC_PACKAGES+= meta-pkgs/modular-xorg-libs \ meta-pkgs/modular-xorg-fonts \ - meta-pkgs/modular-xorg-libs \ + meta-pkgs/modular-xorg-apps \ + meta-pkgs/modular-xorg-drivers \ + x11/libXinerama \ wm/fluxbox \ wm/fvwm \ www/firefox \ @@ -127,7 +134,6 @@ PKGSRC_PACKAGES+= meta-pkgs/modular-xorg-apps \ editors/emacs \ editors/vim \ chat/irssi \ - chat/xchat \ x11/modular-xorg-server \ x11/eterm \ lang/perl5 \ -- 2.41.0