On Mon, Apr 14, 2008 at 12:42 PM, Eric Faurot <[EMAIL PROTECTED]> wrote:
> This is a work-in-progress port of emacs 22.2 based on a post
> by Fulvio Ciriaco. Contributions are most welcome.
Cool.
patch below adds a gtk flavor for using the gtk toolkit instead of the
default one. I'm not sure about the LIB_DEPENDS part though; I just
put the major versions from the system I tested on and confirmed that
it works and passed "make lib-depends-check".
Also, I fixed the PLIST-{main,el} files to catch a few new .el.gz
files that snuck into PLIST-main.
(Sorry if the Makefile diff wraps; I'm not sure how to fit 80 columns
with library-specs. :-()
diff -rpu emacs22/Makefile /usr/ports/editors/emacs22/Makefile
--- emacs22/Makefile Fri Apr 11 14:11:35 2008
+++ /usr/ports/editors/emacs22/Makefile Mon Apr 14 14:21:48 2008
@@ -26,7 +26,7 @@ MULTI_PACKAGES= -main -el
USE_GMAKE= Yes
-FLAVORS= no_x11
+FLAVORS= no_x11 gtk
FLAVOR?=
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
@@ -51,6 +51,24 @@ SUBST_VARS= GCCARCH VERSION
WANTLIB-main= c m ncurses ossaudio
.if ${FLAVOR:L:Mno_x11}
CONFIGURE_ARGS+= --with-x=no
+.elif ${FLAVOR:L:Mgtk}
+USE_X11=Yes
+CONFIGURE_ARGS+= --with-x-toolkit=gtk
+LIB_DEPENDS-main=
gtk-x11-2.0.>=1200,gdk_pixbuf-2.0.>=1200,gdk-x11-2.0.>=1200::x11/gtk+2
\
+ atk-1.0.>=2009::devel/atk \
+ cairo.>=7::graphics/cairo \
+
glib-2.0.>=1400,gmodule-2.0.>=1400,gobject-2.0.>=1400::devel/glib2 \
+ glitz.>=2::graphics/glitz \
+ iconv.>=4::converters/libiconv \
+ intl.>=4::devel/gettext \
+ jpeg.>=62::graphics/jpeg \
+
pango-1.0.>=1400,pangocairo-1.0.>=1400,pangoft2-1.0.>=1400::devel/pango \
+ png.>=6::graphics/png \
+ tiff.>=38::graphics/tiff \
+ ungif.>=5::graphics/libungif
+WANTLIB-main+= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
+WANTLIB-main+= Xfixes Xft Xi Xinerama Xpm Xrandr Xrender expat
fontconfig
+WANTLIB-main+= freetype pthread z
.else
USE_X11=Yes
LIB_DEPENDS-main= ungif.>=5::graphics/libungif \
diff -rpu emacs22/pkg/PLIST-el /usr/ports/editors/emacs22/pkg/PLIST-el
--- emacs22/pkg/PLIST-el Fri Apr 11 14:36:21 2008
+++ /usr/ports/editors/emacs22/pkg/PLIST-el Mon Apr 14 15:31:50 2008
@@ -690,6 +690,7 @@ share/emacs/${VERSION}/lisp/net/rcirc.el.gz
share/emacs/${VERSION}/lisp/net/rcompile.el.gz
share/emacs/${VERSION}/lisp/net/rlogin.el.gz
share/emacs/${VERSION}/lisp/net/snmp-mode.el.gz
+share/emacs/${VERSION}/lisp/net/socks.el.gz
share/emacs/${VERSION}/lisp/net/telnet.el.gz
share/emacs/${VERSION}/lisp/net/tls.el.gz
share/emacs/${VERSION}/lisp/net/tramp-ftp.el.gz
@@ -851,6 +852,8 @@ share/emacs/${VERSION}/lisp/progmodes/sh-script.el.gz
share/emacs/${VERSION}/lisp/progmodes/simula.el.gz
share/emacs/${VERSION}/lisp/progmodes/sql.el.gz
share/emacs/${VERSION}/lisp/progmodes/tcl.el.gz
+share/emacs/${VERSION}/lisp/progmodes/vera-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/verilog-mode.el.gz
share/emacs/${VERSION}/lisp/progmodes/vhdl-mode.el.gz
share/emacs/${VERSION}/lisp/progmodes/which-func.el.gz
share/emacs/${VERSION}/lisp/progmodes/xscheme.el.gz
@@ -910,8 +913,10 @@ share/emacs/${VERSION}/lisp/term/xterm.el.gz
share/emacs/${VERSION}/lisp/terminal.el.gz
share/emacs/${VERSION}/lisp/textmodes/artist.el.gz
share/emacs/${VERSION}/lisp/textmodes/bib-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/bibtex-style.el.gz
share/emacs/${VERSION}/lisp/textmodes/bibtex.el.gz
share/emacs/${VERSION}/lisp/textmodes/conf-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/css-mode.el.gz
share/emacs/${VERSION}/lisp/textmodes/dns-mode.el.gz
share/emacs/${VERSION}/lisp/textmodes/enriched.el.gz
share/emacs/${VERSION}/lisp/textmodes/fill.el.gz
@@ -994,9 +999,13 @@ share/emacs/${VERSION}/lisp/url/url.el.gz
share/emacs/${VERSION}/lisp/url/vc-dav.el.gz
share/emacs/${VERSION}/lisp/userlock.el.gz
share/emacs/${VERSION}/lisp/vc-arch.el.gz
+share/emacs/${VERSION}/lisp/vc-bzr.el.gz
share/emacs/${VERSION}/lisp/vc-cvs.el.gz
+share/emacs/${VERSION}/lisp/vc-git.el.gz
+share/emacs/${VERSION}/lisp/vc-hg.el.gz
share/emacs/${VERSION}/lisp/vc-hooks.el.gz
share/emacs/${VERSION}/lisp/vc-mcvs.el.gz
+share/emacs/${VERSION}/lisp/vc-mtn.el.gz
share/emacs/${VERSION}/lisp/vc-rcs.el.gz
share/emacs/${VERSION}/lisp/vc-sccs.el.gz
share/emacs/${VERSION}/lisp/vc-svn.el.gz
diff -rpu emacs22/pkg/PLIST-main /usr/ports/editors/emacs22/pkg/PLIST-main
--- emacs22/pkg/PLIST-main Mon Apr 14 11:50:27 2008
+++ /usr/ports/editors/emacs22/pkg/PLIST-main Mon Apr 14 15:31:52 2008
@@ -1298,7 +1298,6 @@ share/emacs/${VERSION}/lisp/net/rcirc.elc
share/emacs/${VERSION}/lisp/net/rcompile.elc
share/emacs/${VERSION}/lisp/net/rlogin.elc
share/emacs/${VERSION}/lisp/net/snmp-mode.elc
-share/emacs/${VERSION}/lisp/net/socks.el.gz
share/emacs/${VERSION}/lisp/net/socks.elc
share/emacs/${VERSION}/lisp/net/telnet.elc
share/emacs/${VERSION}/lisp/net/tls.elc
@@ -1468,9 +1467,7 @@ share/emacs/${VERSION}/lisp/progmodes/sh-script.elc
share/emacs/${VERSION}/lisp/progmodes/simula.elc
share/emacs/${VERSION}/lisp/progmodes/sql.elc
share/emacs/${VERSION}/lisp/progmodes/tcl.elc
-share/emacs/${VERSION}/lisp/progmodes/vera-mode.el.gz
share/emacs/${VERSION}/lisp/progmodes/vera-mode.elc
-share/emacs/${VERSION}/lisp/progmodes/verilog-mode.el.gz
share/emacs/${VERSION}/lisp/progmodes/verilog-mode.elc
share/emacs/${VERSION}/lisp/progmodes/vhdl-mode.elc
share/emacs/${VERSION}/lisp/progmodes/which-func.elc
@@ -1555,11 +1552,9 @@ share/emacs/${VERSION}/lisp/terminal.elc
share/emacs/${VERSION}/lisp/textmodes/
share/emacs/${VERSION}/lisp/textmodes/artist.elc
share/emacs/${VERSION}/lisp/textmodes/bib-mode.elc
-share/emacs/${VERSION}/lisp/textmodes/bibtex-style.el.gz
share/emacs/${VERSION}/lisp/textmodes/bibtex-style.elc
share/emacs/${VERSION}/lisp/textmodes/bibtex.elc
share/emacs/${VERSION}/lisp/textmodes/conf-mode.elc
-share/emacs/${VERSION}/lisp/textmodes/css-mode.el.gz
share/emacs/${VERSION}/lisp/textmodes/css-mode.elc
share/emacs/${VERSION}/lisp/textmodes/dns-mode.elc
share/emacs/${VERSION}/lisp/textmodes/enriched.elc
@@ -1644,16 +1639,12 @@ share/emacs/${VERSION}/lisp/url/url.elc
share/emacs/${VERSION}/lisp/url/vc-dav.elc
share/emacs/${VERSION}/lisp/userlock.elc
share/emacs/${VERSION}/lisp/vc-arch.elc
-share/emacs/${VERSION}/lisp/vc-bzr.el.gz
share/emacs/${VERSION}/lisp/vc-bzr.elc
share/emacs/${VERSION}/lisp/vc-cvs.elc
-share/emacs/${VERSION}/lisp/vc-git.el.gz
share/emacs/${VERSION}/lisp/vc-git.elc
-share/emacs/${VERSION}/lisp/vc-hg.el.gz
share/emacs/${VERSION}/lisp/vc-hg.elc
share/emacs/${VERSION}/lisp/vc-hooks.elc
share/emacs/${VERSION}/lisp/vc-mcvs.elc
-share/emacs/${VERSION}/lisp/vc-mtn.el.gz
share/emacs/${VERSION}/lisp/vc-mtn.elc
share/emacs/${VERSION}/lisp/vc-rcs.elc
share/emacs/${VERSION}/lisp/vc-sccs.elc
