diff options
Diffstat (limited to 'wm')
-rw-r--r-- | wm/enlightenment/DESCR | 8 | ||||
-rw-r--r-- | wm/enlightenment/Makefile | 22 | ||||
-rw-r--r-- | wm/enlightenment/PLIST | 166 | ||||
-rw-r--r-- | wm/enlightenment/distinfo | 13 | ||||
-rw-r--r-- | wm/enlightenment/options.mk | 36 | ||||
-rw-r--r-- | wm/enlightenment/patches/patch-aa | 33 | ||||
-rw-r--r-- | wm/enlightenment/patches/patch-ac | 24 |
7 files changed, 163 insertions, 139 deletions
diff --git a/wm/enlightenment/DESCR b/wm/enlightenment/DESCR index f9ad5168694..58de13479f9 100644 --- a/wm/enlightenment/DESCR +++ b/wm/enlightenment/DESCR @@ -1,8 +1,12 @@ -Enlightenment is a window manager for the X Window System that is designed to -be powerful, extensible, configurable and pretty darned good looking! It is +Enlightenment 16 is a window manager for the X Window System that is designed +to be powerful, extensible, configurable and pretty darned good looking! It is one of the more graphically intense window managers. Enlightenment goes beyond managing windows by providing a useful and appealing graphical shell from which to work. It is open in design and instead of dictating a policy, allows the user to define their own policy, down to every last detail. + +This is Enlightenment 16, an older, stable branch which continues to be +maintained separately from ongoing Enlightenment development, due to its more +lightweight nature. diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 165893e37ec..32c7a630bac 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,25 +1,19 @@ -# $NetBSD: Makefile,v 1.72 2019/08/11 13:24:14 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2019/12/07 04:50:49 gutteridge Exp $ -DISTNAME= e16-0.16.8.8 +DISTNAME= e16-1.0.21 PKGNAME= ${DISTNAME:S/e16/enlightenment/} -PKGREVISION= 24 -CATEGORIES= x11 gnome wm +CATEGORIES= x11 wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://enlightenment.org/ COMMENT= Highly themeable and configurable window manager +LICENSE= enlightenment16 -USE_TOOLS+= bison perl:run pkg-config +USE_TOOLS+= perl:run pkg-config USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-fsstd -CONFIGURE_ARGS+= --enable-xrandr -CONFIGURE_ARGS+= --enable-xft -CONFIGURE_ARGS+= --disable-composite -CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --disable-hints-gnome -CONFIGURE_ARGS+= --disable-hints-kde MAKE_ENV+= USER=${SHAREOWN}:${SHAREGRP} INSTALL_MAKE_FLAGS+= sesmdir=${WRKDIR}/.tmp @@ -38,6 +32,8 @@ SUBST_VARS.paths+= X11BASE PLIST_VARS+= libhack +.include "options.mk" + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || \ @@ -50,13 +46,15 @@ post-install: ${XARGS} ${CHMOD} ${BINMODE} ${FIND} ${DESTDIR}${PREFIX}/share/e16/themes -type f -print | \ ${XARGS} ${CHMOD} ${SHAREMODE} + cd ${DESTDIR}${PREFIX}/share/e16 && ${RM} -rf fonts -.include "../../audio/esound/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" +.include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" diff --git a/wm/enlightenment/PLIST b/wm/enlightenment/PLIST index b7018a44672..1579ed81370 100644 --- a/wm/enlightenment/PLIST +++ b/wm/enlightenment/PLIST @@ -1,10 +1,14 @@ -@comment $NetBSD: PLIST,v 1.14 2013/05/17 19:38:59 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.15 2019/12/07 04:50:49 gutteridge Exp $ bin/e16 bin/edox bin/eesh bin/epp bin/starte16 ${PLIST.libhack}lib/libe16_hack.la +man/man1/e16.1 +share/applications/e16.desktop +share/doc/e16/e16.html +share/e16/E-docs/bg.png share/e16/E-docs/exit1.png share/e16/E-docs/exit2.png share/e16/E-docs/next1.png @@ -16,79 +20,80 @@ share/e16/config/actionclasses.cfg share/e16/config/bindings.cfg share/e16/config/definitions share/e16/config/e16keyedit.db -share/e16/config/fonts.cfg-xft_example +share/e16/config/fonts.pango.cfg +share/e16/config/fonts.xft.cfg share/e16/config/matches.cfg -share/e16/config/menus.cfg -share/e16/config/pix/about.png -share/e16/config/pix/apple.png -share/e16/config/pix/areas.png -share/e16/config/pix/bg.png -share/e16/config/pix/calc.png -share/e16/config/pix/clock.png -share/e16/config/pix/desktops.png -share/e16/config/pix/easter.png -share/e16/config/pix/elogo48.png -share/e16/config/pix/focus.png -share/e16/config/pix/fx.png -share/e16/config/pix/key_blank.png -share/e16/config/pix/key_ctrl.png -share/e16/config/pix/key_lock.png -share/e16/config/pix/key_mod1.png -share/e16/config/pix/key_mod2.png -share/e16/config/pix/key_mod3.png -share/e16/config/pix/key_mod4.png -share/e16/config/pix/key_mod5.png -share/e16/config/pix/key_shift.png -share/e16/config/pix/mon.png -share/e16/config/pix/mouse_0.png -share/e16/config/pix/mouse_1.png -share/e16/config/pix/mouse_2.png -share/e16/config/pix/mouse_3.png -share/e16/config/pix/mouse_4.png -share/e16/config/pix/mouse_5.png -share/e16/config/pix/mouse_any.png -share/e16/config/pix/moveres.png -share/e16/config/pix/note.png -share/e16/config/pix/pager.png -share/e16/config/pix/place.png -share/e16/config/pix/pumpkin.png -share/e16/config/pix/raise.png -share/e16/config/pix/snapshots.png -share/e16/config/pix/sound.png -share/e16/config/pix/spider.png -share/e16/config/pix/tips.png -share/e16/config/pix/tv2.png -share/e16/config/pix/wait1.png -share/e16/config/pix/wait10.png -share/e16/config/pix/wait11.png -share/e16/config/pix/wait12.png -share/e16/config/pix/wait2.png -share/e16/config/pix/wait3.png -share/e16/config/pix/wait4.png -share/e16/config/pix/wait5.png -share/e16/config/pix/wait6.png -share/e16/config/pix/wait7.png -share/e16/config/pix/wait8.png -share/e16/config/pix/wait9.png -share/e16/config/pix/world.png -share/e16/misc/E-GNOME -share/e16/misc/E-KDE -share/e16/misc/E16 -share/e16/misc/Xclients.e-gnome -share/e16/misc/Xclients.e-kde -share/e16/misc/Xclients.e16 -share/e16/misc/e16-gnome.desktop -share/e16/misc/e16-kde.desktop -share/e16/misc/e16.desktop -share/e16/misc/e16.png +share/e16/icons/default.png +share/e16/icons/e.png +share/e16/icons/e16.png +share/e16/icons/iconbox.png +share/e16/icons/mon.png +share/e16/icons/pager.png +share/e16/menus/desktop.menu +share/e16/menus/enlightenment.menu +share/e16/menus/maintenance.menu +share/e16/menus/settings.menu +share/e16/menus/winops.menu +share/e16/menus/winops_groups.menu +share/e16/menus/winops_layer.menu +share/e16/menus/winops_misc.menu +share/e16/menus/winops_opacity.menu +share/e16/menus/winops_size.menu +share/e16/misc/Xclients.e16-gnome.sh +share/e16/misc/Xclients.e16-kde.sh +share/e16/misc/Xclients.e16.sh +share/e16/misc/e16-dbus-cmd share/e16/misc/starte16 +share/e16/misc/starte16-gnome +share/e16/misc/starte16-kde +share/e16/pix/about.png +share/e16/pix/areas.png +share/e16/pix/bg.png +share/e16/pix/desktops.png +share/e16/pix/elogo48.png +share/e16/pix/focus.png +share/e16/pix/fx.png +share/e16/pix/key_blank.png +share/e16/pix/key_ctrl.png +share/e16/pix/key_lock.png +share/e16/pix/key_mod1.png +share/e16/pix/key_mod2.png +share/e16/pix/key_mod3.png +share/e16/pix/key_mod4.png +share/e16/pix/key_mod5.png +share/e16/pix/key_shift.png +share/e16/pix/mouse_0.png +share/e16/pix/mouse_1.png +share/e16/pix/mouse_2.png +share/e16/pix/mouse_3.png +share/e16/pix/mouse_4.png +share/e16/pix/mouse_5.png +share/e16/pix/mouse_any.png +share/e16/pix/moveres.png +share/e16/pix/pager.png +share/e16/pix/place.png +share/e16/pix/raise.png +share/e16/pix/snapshots.png +share/e16/pix/sound.png +share/e16/pix/tips.png +share/e16/pix/wait1.png +share/e16/pix/wait10.png +share/e16/pix/wait11.png +share/e16/pix/wait12.png +share/e16/pix/wait2.png +share/e16/pix/wait3.png +share/e16/pix/wait4.png +share/e16/pix/wait5.png +share/e16/pix/wait6.png +share/e16/pix/wait7.png +share/e16/pix/wait8.png +share/e16/pix/wait9.png share/e16/scripts/e_cache_clean share/e16/scripts/e_cache_query share/e16/scripts/e_gen_menu share/e16/scripts/session.sh share/e16/themes/winter/ABOUT/MAIN share/e16/themes/winter/ABOUT/bg.png -share/e16/themes/winter/ABOUT/vixar.ttf share/e16/themes/winter/README share/e16/themes/winter/backgrounds/backgrounds.cfg share/e16/themes/winter/backgrounds/images/startup-bg.png @@ -330,10 +335,7 @@ share/e16/themes/winter/eterm/images/t.png share/e16/themes/winter/focuslist/focuslist.cfg share/e16/themes/winter/focuslist/images/hbar.png share/e16/themes/winter/focuslist/images/hbar2.png -share/e16/themes/winter/fonts.cfg -share/e16/themes/winter/fonts.cfg.ja -share/e16/themes/winter/fonts.cfg.ko -share/e16/themes/winter/fonts.cfg.pl +share/e16/themes/winter/fonts.theme.cfg share/e16/themes/winter/iconbox/iconbox.cfg share/e16/themes/winter/iconbox/images/base_.png share/e16/themes/winter/iconbox/images/bg.png @@ -369,25 +371,39 @@ share/e16/themes/winter/tooltips.cfg share/e16/themes/winter/tooltips/images/clear.png share/e16/themes/winter/tooltips/images/tooltipbg.png share/e16/themes/winter/tooltips/tooltips.cfg -share/e16/themes/winter/ttfonts/COPYRIGHT.Vera -share/e16/themes/winter/ttfonts/LICENSE.Vera -share/e16/themes/winter/ttfonts/Vera.ttf -share/e16/themes/winter/ttfonts/VeraBd.ttf +share/gnome-session/sessions/e16-gnome.session +share/locale/ar/LC_MESSAGES/e16.mo share/locale/bg/LC_MESSAGES/e16.mo share/locale/bs/LC_MESSAGES/e16.mo +share/locale/ca/LC_MESSAGES/e16.mo +share/locale/cs/LC_MESSAGES/e16.mo +share/locale/csb/LC_MESSAGES/e16.mo share/locale/da/LC_MESSAGES/e16.mo share/locale/de/LC_MESSAGES/e16.mo share/locale/en_US/LC_MESSAGES/e16.mo +share/locale/eo/LC_MESSAGES/e16.mo share/locale/es/LC_MESSAGES/e16.mo +share/locale/fo/LC_MESSAGES/e16.mo share/locale/fr/LC_MESSAGES/e16.mo +share/locale/gl/LC_MESSAGES/e16.mo +share/locale/hr/LC_MESSAGES/e16.mo share/locale/hu/LC_MESSAGES/e16.mo +share/locale/it/LC_MESSAGES/e16.mo share/locale/ja/LC_MESSAGES/e16.mo share/locale/ko/LC_MESSAGES/e16.mo +share/locale/nb/LC_MESSAGES/e16.mo share/locale/nl/LC_MESSAGES/e16.mo -share/locale/no/LC_MESSAGES/e16.mo share/locale/pl/LC_MESSAGES/e16.mo share/locale/pt/LC_MESSAGES/e16.mo share/locale/pt_BR/LC_MESSAGES/e16.mo share/locale/ru/LC_MESSAGES/e16.mo +share/locale/sk/LC_MESSAGES/e16.mo +share/locale/sr/LC_MESSAGES/e16.mo share/locale/sv/LC_MESSAGES/e16.mo share/locale/tr/LC_MESSAGES/e16.mo +share/locale/uk/LC_MESSAGES/e16.mo +share/locale/zh_CN/LC_MESSAGES/e16.mo +share/xsessions/e16-gnome2-session.desktop +share/xsessions/e16-gnome3-session.desktop +share/xsessions/e16-kde-session.desktop +share/xsessions/e16-session.desktop diff --git a/wm/enlightenment/distinfo b/wm/enlightenment/distinfo index 3ab3c48ed0f..c3c75c3f1f4 100644 --- a/wm/enlightenment/distinfo +++ b/wm/enlightenment/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.13 2015/11/02 23:42:52 agc Exp $ +$NetBSD: distinfo,v 1.14 2019/12/07 04:50:49 gutteridge Exp $ -SHA1 (e16-0.16.8.8.tar.gz) = 94d9dc2a645c5c368b58b595ee75d60ba0db8fd4 -RMD160 (e16-0.16.8.8.tar.gz) = 46e101b8ed75a5cf96789cfc86bb541eda5301f5 -SHA512 (e16-0.16.8.8.tar.gz) = f5424d52f1ba1580dadcd38e240381d131916ede019f2ccb00ab6be703197129a9ecfcfcc4d2bfc7c03a2dce9ffcd14bce009fd1af5d5e362961f316a49efaf4 -Size (e16-0.16.8.8.tar.gz) = 2005407 bytes -SHA1 (patch-aa) = 21772995ff370c81073b4c0dfd7f3182bab93768 -SHA1 (patch-ac) = 49e155007b1efe8b9b5d472e6d58c5a78bf3d7c4 +SHA1 (e16-1.0.21.tar.gz) = 758540c24d09350f8ceb9e1987995c7783cc40e1 +RMD160 (e16-1.0.21.tar.gz) = fc40cbdc6ca376cd42961e4bd5f7ecd6547e3dad +SHA512 (e16-1.0.21.tar.gz) = 1803675f0d40ea1ec8467094a47c5c6d3ccf0d3fd52aa617d00697f8be7b89e9447b07986b2aa0b8627c6177adf6b63949f92b2a77224ab992d33df54f1ad1d9 +Size (e16-1.0.21.tar.gz) = 2472975 bytes +SHA1 (patch-ac) = 7bdc297bf96e5d79ee51b00708f65cf4283ac6e0 diff --git a/wm/enlightenment/options.mk b/wm/enlightenment/options.mk new file mode 100644 index 00000000000..c709f25632f --- /dev/null +++ b/wm/enlightenment/options.mk @@ -0,0 +1,36 @@ +# $NetBSD: options.mk,v 1.1 2019/12/07 04:50:49 gutteridge Exp $ + +# e16 is used here instead of enlightenment to avoid +# potential conflict with x11/enlightenment. +PKG_OPTIONS_VAR= PKG_OPTIONS.e16 + +PKG_SUPPORTED_OPTIONS= pango pulseaudio vera-ttf + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mpango) +CONFIGURE_ARGS+= --enable-pango +.include "../../devel/pango/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-pango +.endif + +.if !empty(PKG_OPTIONS:Mpulseaudio) +CONFIGURE_ARGS+= --enable-sound=pulseaudio +CONFIGURE_ARGS+= --with-sndldr=sndfile +.include "../../audio/libsndfile/buildlink3.mk" +.include "../../audio/pulseaudio/buildlink3.mk" +.else +CONFIGURE_ARGS+= --enable-sound=esound +CONFIGURE_ARGS+= --with-sndldr=audiofile +.include "../../audio/libaudiofile/buildlink3.mk" +.include "../../audio/esound/buildlink3.mk" +.endif + +# The upstream package includes its own Vera fonts. Because these have +# a different (non-default) license, and are also included in some base +# OS distributions (like NetBSD's native X11), this has been made +# optional. +.if !empty(PKG_OPTIONS:Mvera-ttf) +DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf +.endif diff --git a/wm/enlightenment/patches/patch-aa b/wm/enlightenment/patches/patch-aa deleted file mode 100644 index abe237f1b8e..00000000000 --- a/wm/enlightenment/patches/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2004/08/26 20:22:18 recht Exp $ - ---- dox/file.c.orig 2004-07-01 20:51:46.000000000 +0200 -+++ dox/file.c -@@ -26,6 +26,11 @@ - # include <wctype.h> - #endif - -+#include <sys/param.h> -+#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106210000) -+typedef unsigned int wctype_t; -+#endif -+ - static int - exists(char *s) - { -@@ -175,6 +180,7 @@ word_mb(char *s, int num, char *wd, int - } - - /* Check multibyte character class is available or not */ -+/* - wcflg = 0; - for (cc = char_class_tbl; cc->name != NULL; cc++) - { -@@ -182,7 +188,7 @@ word_mb(char *s, int num, char *wd, int - if (cc->wt != (wctype_t) 0) - wcflg = 1; - } -- -+*/ - cnt = 0; - i = 0; - start = NULL; diff --git a/wm/enlightenment/patches/patch-ac b/wm/enlightenment/patches/patch-ac index 2474e077891..bc4fe307b86 100644 --- a/wm/enlightenment/patches/patch-ac +++ b/wm/enlightenment/patches/patch-ac @@ -1,23 +1,27 @@ -$NetBSD: patch-ac,v 1.5 2006/12/02 18:20:43 obache Exp $ +$NetBSD: patch-ac,v 1.6 2019/12/07 04:50:49 gutteridge Exp $ ---- scripts/e_gen_menu.orig 2006-10-03 22:03:17.000000000 +0000 +Apply pkgsrc-specific paths. + +--- scripts/e_gen_menu.orig 2019-11-19 00:17:54.796424791 +0000 +++ scripts/e_gen_menu -@@ -25,8 +25,7 @@ - ############################################################################## +@@ -28,8 +28,7 @@ + #use warnings; # Likely prefixes -$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}"; -$Prefixes = "$Prefixes:/opt/kde3:/opt/gnome"; # SUSE +$Prefixes = "@LOCALBASE@:@X11BASE@:/usr:$ENV{'KDEDIR'}"; + $Prefixes = "$Prefixes:$ENV{'HOME'}/.local"; $Prefixes = RemoveDuplcates($Prefixes); - # Where to look for GNOME2/KDE2,3 stuff -@@ -54,7 +53,7 @@ $loc3 =~ s/_.*//; +@@ -59,8 +58,8 @@ $loc3 =~ s/_.*//; $loc1 = "" if ($loc1 eq $loc2); $EdirUser = "$ENV{'HOME'}/.e16" unless $EdirUser; --$EdirRoot = "/usr/share/enlightenment" unless $EdirRoot; -+$EdirRoot = "@PREFIX@/share/enlightenment" unless $EdirRoot; - $EdirBin = "/usr/bin" unless $EdirBin; +-$EdirRoot = "/usr/share/e16" unless $EdirRoot; +-$EdirBin = "/usr/bin" unless $EdirBin; ++$EdirRoot = "@PREFIX@/share/e16" unless $EdirRoot; ++$EdirBin = "@PREFIX@/bin" unless $EdirBin; + + $EdirMenus = "$EdirUser/menus"; - $EdirIcons = "$EdirUser/icons"; |