diff options
author | vanilla <vanilla@FreeBSD.org> | 1997-12-11 06:48:54 +0800 |
---|---|---|
committer | vanilla <vanilla@FreeBSD.org> | 1997-12-11 06:48:54 +0800 |
commit | d834bbde5d9d41be92a5b5abcd13f3b9ee93e27d (patch) | |
tree | e89fa9f80a7f492efae05072faac46f24df77403 /x11-wm | |
parent | 681829c8008fd5594257441ee1a3fa5c941e4c6d (diff) | |
download | freebsd-ports-graphics-d834bbde5d9d41be92a5b5abcd13f3b9ee93e27d.tar.gz freebsd-ports-graphics-d834bbde5d9d41be92a5b5abcd13f3b9ee93e27d.tar.zst freebsd-ports-graphics-d834bbde5d9d41be92a5b5abcd13f3b9ee93e27d.zip |
Upgrade to 1.2.4
PR: ports/5264
Submitted by: Maintainer
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/xfce/Makefile | 14 | ||||
-rw-r--r-- | x11-wm/xfce/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/xfce/files/patch-aa | 241 | ||||
-rw-r--r-- | x11-wm/xfce/pkg-plist | 5 | ||||
-rw-r--r-- | x11-wm/xfce4/Makefile | 14 | ||||
-rw-r--r-- | x11-wm/xfce4/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/xfce4/files/patch-aa | 241 | ||||
-rw-r--r-- | x11-wm/xfce4/pkg-plist | 5 |
8 files changed, 336 insertions, 188 deletions
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index 7ecf2e94c5d..fce9ce5dc2e 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -1,26 +1,24 @@ # New ports collection makefile for: xfce -# Version required: 1.2.3 +# Version required: 1.2.4 # Date created: 30 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1997/08/31 17:10:45 max Exp $ # -DISTNAME= xfce-1.2.3 +DISTNAME= xfce-1.2.4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/toolbars MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp -LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm -LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms +LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \ + xforms\\.0\\.:${PORTSDIR}/x11/xforms -WRKSRC= ${WRKDIR}/XFCE-1.2.3 +WRKSRC= ${WRKDIR}/XFCE-1.2.4 USE_GMAKE= yes USE_IMAKE= yes XMKMF= xmkmf -MAN1= XFCE.1 -MANCOMPRESSED= yes .include <bsd.port.mk> diff --git a/x11-wm/xfce/distinfo b/x11-wm/xfce/distinfo index 8880fd31cc6..1e3981e3737 100644 --- a/x11-wm/xfce/distinfo +++ b/x11-wm/xfce/distinfo @@ -1 +1 @@ -MD5 (xfce-1.2.3.tar.gz) = 1a5eb0554ec9ecc91fbc7b300aaa1e98 +MD5 (xfce-1.2.4.tar.gz) = 42b11ee2250451d5edc5270c30ada324 diff --git a/x11-wm/xfce/files/patch-aa b/x11-wm/xfce/files/patch-aa index e16e46592b5..014bc87f540 100644 --- a/x11-wm/xfce/files/patch-aa +++ b/x11-wm/xfce/files/patch-aa @@ -1,85 +1,156 @@ ---- Imakefile.orig Mon Jun 23 08:23:00 1997 -+++ Imakefile Mon Sep 1 01:49:47 1997 -@@ -1,9 +1,9 @@ --XPIXMAPDIR = /usr/X11/include/X11/pixmaps --XBINDIR = /usr/local/bin --XFCE_DIR = /var/XFCE --XFCE_PAL = /var/XFCE/palettes --FVWM_MODULES = /usr/lib/X11/fvwm --FVWM2_MODULES = /usr/lib/X11/fvwm2 -+XPIXMAPDIR = /usr/X11R6/include/X11/pixmaps -+XBINDIR = /usr/X11R6/bin -+XFCE_DIR = /usr/X11R6/lib/X11/XFCE -+XFCE_PAL = /usr/X11R6/lib/X11/XFCE/palettes -+FVWM_MODULES = /usr/X11R6/lib/X11/fvwm -+FVWM2_MODULES = /usr/X11R6/lib/X11/fvwm2 - FVWM_SRC = $(wildcard /usr/src/fvwm-1*) - FVWM2_SRC = $(wildcard /usr/src/fvwm-2*) - -@@ -17,8 +17,8 @@ - my_string.o pulldown.o screen.o screen_cb.o selects.o sendinfo.o startup.o\ - tiptools.o - --XCOMM for LINUX: --EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm -+XCOMM for FreeBSD: -+EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm - - XCOMM Which header file for FVWM do we use ? - XCOMM Use the one shipped with XFCE by default -@@ -49,38 +49,38 @@ - install_palettes:: @@\ - mkdir -p $(XFCE_PAL) @@\ - chmod a+rw $(XFCE_PAL) @@\ -- cp -vpb palettes\/* $(XFCE_PAL) @@\ -+ cp palettes\/* $(XFCE_PAL) @@\ - - install_bin:: XFCE install.man @@\ - @if [ -d $(XBINDIR) ]; then set +x; \ @@\ - else (set -x; $(MKDIRHIER) $(XBINDIR)); fi @@\ -- @cp -vfb XFCE $(XBINDIR); @@\ -- ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce; @@\ -+ @cp XFCE $(XBINDIR); @@\ -+ ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce; @@\ - @chmod 0755 $(XBINDIR)/XFCE; @@\ - @if [ -d $(FVWM_MODULES) ]; then \ @@\ -- ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi @@\ -+ ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi @@\ - @if [ -d $(FVWM2_MODULES) ]; then \ @@\ -- ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi @@\ -+ ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi @@\ - mkdir -p $(XFCE_DIR) @@\ -- @cp -vpb sample.fvwmrc $(XFCE_DIR)/sample.fvwmrc; @@\ -- @cp -vpb sample.fvwm2rc $(XFCE_DIR)/sample.fvwm2rc; @@\ -- @cp -vpb sample.xfcerc $(XFCE_DIR)/sample.xfcerc; @@\ -- @cp -vpb sample.xinitrc $(XFCE_DIR)/sample.xinitrc; @@\ -- ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; @@\ -- ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; @@\ -- ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; @@\ -- ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; @@\ -+ @cp sample.fvwmrc $(XFCE_DIR)/sample.fvwmrc; @@\ -+ @cp sample.fvwm2rc $(XFCE_DIR)/sample.fvwm2rc; @@\ -+ @cp sample.xfcerc $(XFCE_DIR)/sample.xfcerc; @@\ -+ @cp sample.xinitrc $(XFCE_DIR)/sample.xinitrc; @@\ -+ ln -sf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; @@\ -+ ln -sf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; @@\ -+ ln -sf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; @@\ -+ ln -sf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; @@\ - - install_logo:: install_bin install_palettes @@\ - @mkdir -p $(XFCE_DIR) @@\ -- @cp -vpb XFCE_full.logo $(XFCE_DIR); @@\ -- @cp -vpb XFCE_dithered.logo $(XFCE_DIR); @@\ -+ @cp XFCE_full.logo $(XFCE_DIR); @@\ -+ @cp XFCE_dithered.logo $(XFCE_DIR); @@\ - - install_full:: install_logo @@\ -- ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; @@\ -+ ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; @@\ - - install_dithered:: install_logo @@\ -- ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; @@\ -+ ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; @@\ - - install:: install_full @@\ - +*** Imakefile.orig Wed Aug 20 08:24:00 1997 +--- Imakefile Wed Oct 1 09:09:23 1997 +*************** +*** 1,7 **** +! XPIXMAPDIR = /usr/X11/include/X11/pixmaps +! XBINDIR = /usr/X11/bin +! XFCE_DIR = /var/XFCE +! XFCE_PAL = /var/XFCE/palettes + FVWM_MODULES = /usr/lib/X11/fvwm + FVWM2_MODULES = /usr/lib/X11/fvwm2 + FVWM_SRC = $(wildcard /usr/src/fvwm-1*) +--- 1,7 ---- +! XPIXMAPDIR = /usr/X11R6/lib/X11/XFCE/pixmaps +! XBINDIR = /usr/X11R6/bin +! XFCE_DIR = /usr/X11R6/lib/X11/XFCE +! XFCE_PAL = /usr/X11R6/lib/X11/XFCE/palettes + FVWM_MODULES = /usr/lib/X11/fvwm + FVWM2_MODULES = /usr/lib/X11/fvwm2 + FVWM_SRC = $(wildcard /usr/src/fvwm-1*) +*************** +*** 17,24 **** + my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\ + sendinfo.o startup.o tiptools.o + +! XCOMM for LINUX: +! EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm + + XCOMM for static link with XForms + XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm +--- 17,24 ---- + my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\ + sendinfo.o startup.o tiptools.o + +! XCOMM for FreeBSD: +! EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm + + XCOMM for static link with XForms + XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm +*************** +*** 60,85 **** + install_palettes:: + mkdir -p $(XFCE_PAL) + chmod a+rw $(XFCE_PAL) +! cp -vpb palettes\/* $(XFCE_PAL) + + install_bin:: XFCE install.man + @if [ -d $(XBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(XBINDIR)); fi +! @cp -vfb XFCE $(XBINDIR); +! ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce; + @chmod 0755 $(XBINDIR)/XFCE; + @if [ -d $(FVWM_MODULES) ]; then \ +! ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi + @if [ -d $(FVWM2_MODULES) ]; then \ +! ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi + mkdir -p $(XFCE_DIR) + mkdir -p $(XFCE_DIR)/doc +! @cp -vpb sample.* $(XFCE_DIR)/; +! @cp -vpb INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/ +! ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; +! ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; +! ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; +! ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; + @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi + $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \ +--- 60,85 ---- + install_palettes:: + mkdir -p $(XFCE_PAL) + chmod a+rw $(XFCE_PAL) +! cp -R palettes\/* $(XFCE_PAL) + + install_bin:: XFCE install.man + @if [ -d $(XBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(XBINDIR)); fi +! @cp -R XFCE $(XBINDIR); +! ln -s $(XBINDIR)/XFCE $(XBINDIR)/xfce; + @chmod 0755 $(XBINDIR)/XFCE; + @if [ -d $(FVWM_MODULES) ]; then \ +! ln -s $(XBINDIR)/XFCE $(FVWM_MODULES); fi + @if [ -d $(FVWM2_MODULES) ]; then \ +! ln -s $(XBINDIR)/XFCE $(FVWM2_MODULES); fi + mkdir -p $(XFCE_DIR) + mkdir -p $(XFCE_DIR)/doc +! @cp -R sample.* $(XFCE_DIR)/; +! @cp -R INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/ +! ln -s $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; +! ln -s $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; +! ln -s $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; +! ln -s $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; + @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi + $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \ +*************** +*** 97,126 **** + + install_logo:: install_bin install_palettes + @mkdir -p $(XFCE_DIR) +! @cp -vpb XFCE_full.logo $(XFCE_DIR); +! @cp -vpb XFCE_dithered.logo $(XFCE_DIR); + + install_full:: install_logo +! ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; + + install_dithered:: install_logo +! ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; + + install:: install_full + + francais:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + english:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + italiano:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + deutsch:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + +--- 97,126 ---- + + install_logo:: install_bin install_palettes + @mkdir -p $(XFCE_DIR) +! @cp -R XFCE_full.logo $(XFCE_DIR); +! @cp -R XFCE_dithered.logo $(XFCE_DIR); + + install_full:: install_logo +! ln -s $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; + + install_dithered:: install_logo +! ln -s $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; + + install:: install_full + + francais:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + english:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-en \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + italiano:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-it \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + deutsch:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-de \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist index 4f497a8e9c4..1bd1f737fa4 100644 --- a/x11-wm/xfce/pkg-plist +++ b/x11-wm/xfce/pkg-plist @@ -7,6 +7,10 @@ lib/X11/XFCE/.xinitrc lib/X11/XFCE/XFCE.logo lib/X11/XFCE/XFCE_dithered.logo lib/X11/XFCE/XFCE_full.logo +lib/X11/XFCE/doc/COPYRIGHT +lib/X11/XFCE/doc/INSTALL +lib/X11/XFCE/doc/MANUAL +lib/X11/XFCE/doc/README lib/X11/XFCE/palettes/Alpine lib/X11/XFCE/palettes/Anthracite lib/X11/XFCE/palettes/Bahamas @@ -29,5 +33,6 @@ lib/X11/XFCE/sample.fvwmrc lib/X11/XFCE/sample.xfcerc lib/X11/XFCE/sample.xinitrc man/man1/XFCE.1.gz +@dirrm lib/X11/XFCE/doc @dirrm lib/X11/XFCE/palettes @dirrm lib/X11/XFCE diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 7ecf2e94c5d..fce9ce5dc2e 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -1,26 +1,24 @@ # New ports collection makefile for: xfce -# Version required: 1.2.3 +# Version required: 1.2.4 # Date created: 30 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1997/08/31 17:10:45 max Exp $ # -DISTNAME= xfce-1.2.3 +DISTNAME= xfce-1.2.4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/toolbars MAINTAINER= Nakai@Mlab.t.u-tokyo.ac.jp -LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm -LIB_DEPENDS= xforms\\.0\\.:${PORTSDIR}/x11/xforms +LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \ + xforms\\.0\\.:${PORTSDIR}/x11/xforms -WRKSRC= ${WRKDIR}/XFCE-1.2.3 +WRKSRC= ${WRKDIR}/XFCE-1.2.4 USE_GMAKE= yes USE_IMAKE= yes XMKMF= xmkmf -MAN1= XFCE.1 -MANCOMPRESSED= yes .include <bsd.port.mk> diff --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo index 8880fd31cc6..1e3981e3737 100644 --- a/x11-wm/xfce4/distinfo +++ b/x11-wm/xfce4/distinfo @@ -1 +1 @@ -MD5 (xfce-1.2.3.tar.gz) = 1a5eb0554ec9ecc91fbc7b300aaa1e98 +MD5 (xfce-1.2.4.tar.gz) = 42b11ee2250451d5edc5270c30ada324 diff --git a/x11-wm/xfce4/files/patch-aa b/x11-wm/xfce4/files/patch-aa index e16e46592b5..014bc87f540 100644 --- a/x11-wm/xfce4/files/patch-aa +++ b/x11-wm/xfce4/files/patch-aa @@ -1,85 +1,156 @@ ---- Imakefile.orig Mon Jun 23 08:23:00 1997 -+++ Imakefile Mon Sep 1 01:49:47 1997 -@@ -1,9 +1,9 @@ --XPIXMAPDIR = /usr/X11/include/X11/pixmaps --XBINDIR = /usr/local/bin --XFCE_DIR = /var/XFCE --XFCE_PAL = /var/XFCE/palettes --FVWM_MODULES = /usr/lib/X11/fvwm --FVWM2_MODULES = /usr/lib/X11/fvwm2 -+XPIXMAPDIR = /usr/X11R6/include/X11/pixmaps -+XBINDIR = /usr/X11R6/bin -+XFCE_DIR = /usr/X11R6/lib/X11/XFCE -+XFCE_PAL = /usr/X11R6/lib/X11/XFCE/palettes -+FVWM_MODULES = /usr/X11R6/lib/X11/fvwm -+FVWM2_MODULES = /usr/X11R6/lib/X11/fvwm2 - FVWM_SRC = $(wildcard /usr/src/fvwm-1*) - FVWM2_SRC = $(wildcard /usr/src/fvwm-2*) - -@@ -17,8 +17,8 @@ - my_string.o pulldown.o screen.o screen_cb.o selects.o sendinfo.o startup.o\ - tiptools.o - --XCOMM for LINUX: --EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm -+XCOMM for FreeBSD: -+EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm - - XCOMM Which header file for FVWM do we use ? - XCOMM Use the one shipped with XFCE by default -@@ -49,38 +49,38 @@ - install_palettes:: @@\ - mkdir -p $(XFCE_PAL) @@\ - chmod a+rw $(XFCE_PAL) @@\ -- cp -vpb palettes\/* $(XFCE_PAL) @@\ -+ cp palettes\/* $(XFCE_PAL) @@\ - - install_bin:: XFCE install.man @@\ - @if [ -d $(XBINDIR) ]; then set +x; \ @@\ - else (set -x; $(MKDIRHIER) $(XBINDIR)); fi @@\ -- @cp -vfb XFCE $(XBINDIR); @@\ -- ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce; @@\ -+ @cp XFCE $(XBINDIR); @@\ -+ ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce; @@\ - @chmod 0755 $(XBINDIR)/XFCE; @@\ - @if [ -d $(FVWM_MODULES) ]; then \ @@\ -- ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi @@\ -+ ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi @@\ - @if [ -d $(FVWM2_MODULES) ]; then \ @@\ -- ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi @@\ -+ ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi @@\ - mkdir -p $(XFCE_DIR) @@\ -- @cp -vpb sample.fvwmrc $(XFCE_DIR)/sample.fvwmrc; @@\ -- @cp -vpb sample.fvwm2rc $(XFCE_DIR)/sample.fvwm2rc; @@\ -- @cp -vpb sample.xfcerc $(XFCE_DIR)/sample.xfcerc; @@\ -- @cp -vpb sample.xinitrc $(XFCE_DIR)/sample.xinitrc; @@\ -- ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; @@\ -- ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; @@\ -- ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; @@\ -- ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; @@\ -+ @cp sample.fvwmrc $(XFCE_DIR)/sample.fvwmrc; @@\ -+ @cp sample.fvwm2rc $(XFCE_DIR)/sample.fvwm2rc; @@\ -+ @cp sample.xfcerc $(XFCE_DIR)/sample.xfcerc; @@\ -+ @cp sample.xinitrc $(XFCE_DIR)/sample.xinitrc; @@\ -+ ln -sf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; @@\ -+ ln -sf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; @@\ -+ ln -sf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; @@\ -+ ln -sf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; @@\ - - install_logo:: install_bin install_palettes @@\ - @mkdir -p $(XFCE_DIR) @@\ -- @cp -vpb XFCE_full.logo $(XFCE_DIR); @@\ -- @cp -vpb XFCE_dithered.logo $(XFCE_DIR); @@\ -+ @cp XFCE_full.logo $(XFCE_DIR); @@\ -+ @cp XFCE_dithered.logo $(XFCE_DIR); @@\ - - install_full:: install_logo @@\ -- ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; @@\ -+ ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; @@\ - - install_dithered:: install_logo @@\ -- ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; @@\ -+ ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; @@\ - - install:: install_full @@\ - +*** Imakefile.orig Wed Aug 20 08:24:00 1997 +--- Imakefile Wed Oct 1 09:09:23 1997 +*************** +*** 1,7 **** +! XPIXMAPDIR = /usr/X11/include/X11/pixmaps +! XBINDIR = /usr/X11/bin +! XFCE_DIR = /var/XFCE +! XFCE_PAL = /var/XFCE/palettes + FVWM_MODULES = /usr/lib/X11/fvwm + FVWM2_MODULES = /usr/lib/X11/fvwm2 + FVWM_SRC = $(wildcard /usr/src/fvwm-1*) +--- 1,7 ---- +! XPIXMAPDIR = /usr/X11R6/lib/X11/XFCE/pixmaps +! XBINDIR = /usr/X11R6/bin +! XFCE_DIR = /usr/X11R6/lib/X11/XFCE +! XFCE_PAL = /usr/X11R6/lib/X11/XFCE/palettes + FVWM_MODULES = /usr/lib/X11/fvwm + FVWM2_MODULES = /usr/lib/X11/fvwm2 + FVWM_SRC = $(wildcard /usr/src/fvwm-1*) +*************** +*** 17,24 **** + my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\ + sendinfo.o startup.o tiptools.o + +! XCOMM for LINUX: +! EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm + + XCOMM for static link with XForms + XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm +--- 17,24 ---- + my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\ + sendinfo.o startup.o tiptools.o + +! XCOMM for FreeBSD: +! EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm + + XCOMM for static link with XForms + XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm +*************** +*** 60,85 **** + install_palettes:: + mkdir -p $(XFCE_PAL) + chmod a+rw $(XFCE_PAL) +! cp -vpb palettes\/* $(XFCE_PAL) + + install_bin:: XFCE install.man + @if [ -d $(XBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(XBINDIR)); fi +! @cp -vfb XFCE $(XBINDIR); +! ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce; + @chmod 0755 $(XBINDIR)/XFCE; + @if [ -d $(FVWM_MODULES) ]; then \ +! ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi + @if [ -d $(FVWM2_MODULES) ]; then \ +! ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi + mkdir -p $(XFCE_DIR) + mkdir -p $(XFCE_DIR)/doc +! @cp -vpb sample.* $(XFCE_DIR)/; +! @cp -vpb INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/ +! ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; +! ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; +! ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; +! ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; + @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi + $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \ +--- 60,85 ---- + install_palettes:: + mkdir -p $(XFCE_PAL) + chmod a+rw $(XFCE_PAL) +! cp -R palettes\/* $(XFCE_PAL) + + install_bin:: XFCE install.man + @if [ -d $(XBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(XBINDIR)); fi +! @cp -R XFCE $(XBINDIR); +! ln -s $(XBINDIR)/XFCE $(XBINDIR)/xfce; + @chmod 0755 $(XBINDIR)/XFCE; + @if [ -d $(FVWM_MODULES) ]; then \ +! ln -s $(XBINDIR)/XFCE $(FVWM_MODULES); fi + @if [ -d $(FVWM2_MODULES) ]; then \ +! ln -s $(XBINDIR)/XFCE $(FVWM2_MODULES); fi + mkdir -p $(XFCE_DIR) + mkdir -p $(XFCE_DIR)/doc +! @cp -R sample.* $(XFCE_DIR)/; +! @cp -R INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/ +! ln -s $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc; +! ln -s $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc; +! ln -s $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc; +! ln -s $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc; + @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi + $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \ +*************** +*** 97,126 **** + + install_logo:: install_bin install_palettes + @mkdir -p $(XFCE_DIR) +! @cp -vpb XFCE_full.logo $(XFCE_DIR); +! @cp -vpb XFCE_dithered.logo $(XFCE_DIR); + + install_full:: install_logo +! ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; + + install_dithered:: install_logo +! ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; + + install:: install_full + + francais:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + english:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + italiano:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + deutsch:: +! ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + +--- 97,126 ---- + + install_logo:: install_bin install_palettes + @mkdir -p $(XFCE_DIR) +! @cp -R XFCE_full.logo $(XFCE_DIR); +! @cp -R XFCE_dithered.logo $(XFCE_DIR); + + install_full:: install_logo +! ln -s $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo; + + install_dithered:: install_logo +! ln -s $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo; + + install:: install_full + + francais:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + english:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-en \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + italiano:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-it \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + + deutsch:: +! ln -s $(DESTDIR)$(XAPPLOADDIR)/XFce-de \ + $(DESTDIR)$(XAPPLOADDIR)/XFce + diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist index 4f497a8e9c4..1bd1f737fa4 100644 --- a/x11-wm/xfce4/pkg-plist +++ b/x11-wm/xfce4/pkg-plist @@ -7,6 +7,10 @@ lib/X11/XFCE/.xinitrc lib/X11/XFCE/XFCE.logo lib/X11/XFCE/XFCE_dithered.logo lib/X11/XFCE/XFCE_full.logo +lib/X11/XFCE/doc/COPYRIGHT +lib/X11/XFCE/doc/INSTALL +lib/X11/XFCE/doc/MANUAL +lib/X11/XFCE/doc/README lib/X11/XFCE/palettes/Alpine lib/X11/XFCE/palettes/Anthracite lib/X11/XFCE/palettes/Bahamas @@ -29,5 +33,6 @@ lib/X11/XFCE/sample.fvwmrc lib/X11/XFCE/sample.xfcerc lib/X11/XFCE/sample.xinitrc man/man1/XFCE.1.gz +@dirrm lib/X11/XFCE/doc @dirrm lib/X11/XFCE/palettes @dirrm lib/X11/XFCE |