UPDATE: x11/enlightenment

Hi,

this updates x11/enlightenment to 1.0.19, based on a diff for a previous
version (https://marc.info/?l=openbsd-ports&m=152612070210607&w=2) last
year (which was never committed).

Comments:

- Point homepage to E16 (as newer enlightenment version exist).
- Upstream configure and Makefile.in state that they were created by
Autoconf 2.69 and automake 1.15.1, respectively. So sync
AUTOCONF_VERSION and AUTOMAKE_VERSION accordingly.
- Use do-gen instead of pre-configure hooks.
- Kill patches/patch-m4_ac_attribute_m4 as the underlying file does not
exist anymore upstream.

Tested on amd64 (sound also works).

OK?

Best regards,
Ingo

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/enlightenment/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile 27 Jun 2018 21:04:07 -0000 1.72
+++ Makefile 3 Feb 2019 08:15:39 -0000
@@ -2,23 +2,22 @@

COMMENT= themed window manager

-V= 1.0.9
+V= 1.0.19
DISTNAME= e16-$V
PKGNAME= enlightenment-$V
DOCS= e16-docs-0.16.8.0.2
-THEMES= e16-themes-1.0.1
-REVISION= 10
+THEMES= e16-themes-1.0.2

CATEGORIES= x11

-HOMEPAGE= http://www.enlightenment.org/
+HOMEPAGE= http://www.enlightenment.org/e16

# X11
PERMIT_PACKAGE_CDROM= Yes

WANTLIB = FLAC ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
-WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 graphite2
+WANTLIB += freetype fribidi glib-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z

@@ -28,8 +27,8 @@ DISTFILES= ${DISTNAME}.tar.gz \
${DOCS}.tar.gz \
${THEMES}.tar.gz

-AUTOCONF_VERSION= 2.65
-AUTOMAKE_VERSION= 1.11
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}

@@ -45,31 +44,28 @@ SEPARATE_BUILD= Yes
USE_GMAKE= Yes

CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --disable-sound_esound
+CONFIGURE_ARGS+= --enable-sound=sndio \
+ --with-sndldr=audiofile
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"

post-extract:
cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src

-pre-configure:
- cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4
- cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoconf
- cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoheader
- cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake
+do-gen:
+ cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} aclocal -I m4
+ cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoconf
+ cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoheader
+ cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} automake

post-configure:
- @cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
+ cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
/bin/sh ./configure ${CONFIGURE_ARGS}
- @cd ${WRKDIR}/${THEMES} && ${SETENV} ${CONFIGURE_ENV} \
+ cd ${WRKDIR}/${THEMES} && ${SETENV} ${CONFIGURE_ENV} \
/bin/sh ./configure ${CONFIGURE_ARGS}

post-install:
- @cd ${WRKDIR}/${DOCS} && ${SETENV} ${MAKE_ENV} \
+ cd ${WRKDIR}/${DOCS} && ${SETENV} ${MAKE_ENV} \
${_FAKE_SETUP} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} \
-f ${MAKE_FILE} ${FAKE_TARGET}
cd ${WRKDIR}/${THEMES} && ${SETENV} ${MAKE_ENV} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/enlightenment/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 4 Nov 2014 08:35:57 -0000 1.10
+++ distinfo 3 Feb 2019 08:15:39 -0000
@@ -1,6 +1,6 @@
-SHA256 (e16-1.0.9.tar.gz) = 1DWECkpCnLIvJB14iegoJwYfbvXM2bvIcgr1He4FPSc=
+SHA256 (e16-1.0.19.tar.gz) = +nVGaLhsvmm8EgYfeI9y42aeb8mFeeOAu9BXxSqwvqQ=
SHA256 (e16-docs-0.16.8.0.2.tar.gz) = uNjgyvRZMc5nL6UIipY2hVM6Zamoz+7hUjnZbzuRWT8=
-SHA256 (e16-themes-1.0.1.tar.gz) = M85IxdVlGuOl1WdD9od1zLdj661wMG669+FiWHlAyGU=
-SIZE (e16-1.0.9.tar.gz) = 2256543
+SHA256 (e16-themes-1.0.2.tar.gz) = f/3/XB+koTxwcVNWyVIlZIfQ1k8OpRPnVhHKbmE+coU=
+SIZE (e16-1.0.19.tar.gz) = 2459808
SIZE (e16-docs-0.16.8.0.2.tar.gz) = 1655229
-SIZE (e16-themes-1.0.1.tar.gz) = 8249438
+SIZE (e16-themes-1.0.2.tar.gz) = 8220355
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac 4 Nov 2014 08:35:57 -0000 1.1
+++ patches/patch-configure_ac 3 Feb 2019 08:15:39 -0000
@@ -1,35 +1,41 @@
$OpenBSD: patch-configure_ac,v 1.1 2014/11/04 08:35:57 armani Exp $
---- configure.ac.orig Sun Jul 31 13:33:50 2011
-+++ configure.ac Thu Nov 15 21:38:44 2012
-@@ -93,6 +93,10 @@ if test "x$enable_sound" = "xyes"; then
- AC_ARG_ENABLE(sound_esound,
- [ --enable-sound-esound compile with EsounD sound support @<:@default=yes@:>@],,
- enable_sound_esound=yes)
-+ AC_ARG_ENABLE(sound_sndio,
-+ [ --enable-sound-sndio compile with sndio sound support @<:@default=yes@:>@],,
-+ enable_sound_sndio=yes)
-+
- fi
- enable_sound=no
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -91,12 +91,12 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnom

-@@ -124,6 +128,20 @@ if test "x$enable_sound_esound" = "xyes"; then
- enable_sound=esound
+ AC_ARG_ENABLE(sound,
+ AC_HELP_STRING([--enable-sound],
+- [compile with sound support (pulseaudio/esound/no)@<:@default=pulseaudio@:>@]),,
++ [compile with sound support (pulseaudio/esound/sndio/no)@<:@default=pulseaudio@:>@]),,
+ enable_sound=pulseaudio)
+ case x$enable_sound in
+ xyes)
+ enable_sound=pulseaudio;;
+-xpulseaudio|xesound)
++xpulseaudio|xesound|xsndio)
+ ;;
+ *)
+ enable_sound=no;;
+@@ -137,6 +137,21 @@ if test "x$enable_sound" = "xesound"; then
+ fi
fi
- AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esound" = "xyes")
+ AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xesound")
+
-+if test "x$enable_sound_sndio" = "xyes"; then
-+ AC_CHECK_HEADERS(sndio.h,, enable_sound_sndio=no)
-+ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound_sndio=no)
++if test "x$enable_sound" = "xsndio"; then
++ AC_CHECK_HEADERS(sndio.h,, enable_sound=no
++ AC_MSG_WARN([sndio sound support was requested but not found.]))
++ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound=no)
+ AC_SUBST(SNDIO_LIBS)
++ if test "x$enable_sound" = "xsndio"; then
++ AC_DEFINE(HAVE_SOUND, 1, [Sound support])
++ AC_DEFINE(HAVE_SOUND_SNDIO, 1, [Sndio sound support])
++ AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
++ PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
++ enable_sound=sndio
++ fi
+fi
-+if test "x$enable_sound_sndio" = "xyes"; then
-+ AC_DEFINE(HAVE_SOUND, 1, [Sound support])
-+ AC_DEFINE(HAVE_SOUND_SNDIO, 1, [Sndio sound support])
-+ AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
-+ PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
-+ enable_sound=sndio
-+fi
-+AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound_sndio" = "xyes")
++AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound" = "xsndio")

- # Save CPPFLAGS/LDFLAGS and add X_... to each
- SAVE_CPPFLAGS="$CPPFLAGS"
+ if test "x$enable_sound" != "xno" -a "x$with_sndldr" = "xnone"; then
+ AC_MSG_ERROR([Sound support requires a sound loader])
Index: patches/patch-m4_ac_attribute_m4
===================================================================
RCS file: patches/patch-m4_ac_attribute_m4
diff -N patches/patch-m4_ac_attribute_m4
--- patches/patch-m4_ac_attribute_m4 28 Sep 2017 15:08:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-m4_ac_attribute_m4,v 1.1 2017/09/28 15:08:54 dcoppa Exp $
-
-Index: m4/ac_attribute.m4
---- m4/ac_attribute.m4.orig
-+++ m4/ac_attribute.m4
-@@ -16,8 +16,9 @@ AC_DEFUN([AC_C___ATTRIBUTE__],
- [
- AC_MSG_CHECKING(for __attribute__)
- AC_CACHE_VAL(ac_cv___attribute__, [
-- AC_TRY_COMPILE([#include <stdlib.h>],
-- [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-+ AC_TRY_COMPILE([#include <stdlib.h>
-+ int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-+ [],
- ac_cv___attribute__=yes, ac_cv___attribute__=no)])
- if test "$ac_cv___attribute__" = "yes"; then
- AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
Index: patches/patch-src_Makefile_am
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-src_Makefile_am,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Makefile_am
--- patches/patch-src_Makefile_am 4 Nov 2014 08:35:57 -0000 1.1
+++ patches/patch-src_Makefile_am 3 Feb 2019 08:15:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2014/11/04 08:35:57 armani Exp $
---- src/Makefile.am.orig Sun Jul 31 10:02:54 2011
-+++ src/Makefile.am Thu Nov 15 21:58:47 2012
-@@ -161,7 +161,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)
+Index: src/Makefile.am
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -166,7 +166,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)

libe16dir = $(pkglibdir)

@@ -10,7 +11,7 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 20

if USE_LIBESD
LIBSND_ESD = libsound_esd.la
-@@ -179,6 +179,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(AUDIOFILE_LIBS
+@@ -184,6 +184,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(SNDLDR_LIBS)
libsound_pa_la_LDFLAGS = -module -avoid-version
endif

@@ -24,17 +25,17 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 20
+
LIBFNT_IFT = libfont_ift.la
libfont_ift_la_SOURCES = ttfont.c
- libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS) $(CWARNFLAGS)
-@@ -203,9 +211,9 @@ endif
+ libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS)
+@@ -208,9 +216,9 @@ endif

else

-MODULE_SRCS = sound_esd.c sound_pa.c sound_load.c ttfont.c text_xft.c text_pango.c
--MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(AUDIOFILE_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
--MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(AUDIOFILE_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
+-MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDLDR_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
+-MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDLDR_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
+MODULE_SRCS = sound_esd.c sound_pa.c sound_sndio.c sound_load.c ttfont.c text_xft.c text_pango.c
-+MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDIO_LIBS) $(AUDIOFILE_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
-+MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS) $(AUDIOFILE_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
++MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDIO_LIBS) $(SNDLDR_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
++MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS) $(SNDLDR_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)

endif

Index: patches/patch-src_sound_c
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-src_sound_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_sound_c
--- patches/patch-src_sound_c 4 Nov 2014 08:35:57 -0000 1.1
+++ patches/patch-src_sound_c 3 Feb 2019 08:15:39 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_sound_c,v 1.1 2014/11/04 08:35:57 armani Exp $
---- src/sound.c.orig Sun Jul 31 16:02:52 2011
-+++ src/sound.c Sun Nov 11 14:48:28 2012
+Index: src/sound.c
+--- src/sound.c.orig
++++ src/sound.c
@@ -34,6 +34,8 @@
#define SOUND_SERVER_NAME "esd"
#elif HAVE_SOUND_PA
@@ -10,7 +11,7 @@ $OpenBSD: patch-src_sound_c,v 1.1 2014/1
#else
#error Invalid sound configuration