Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Apr 2014 19:40:31 +0200
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        sbruno@freebsd.org
Cc:        ports@freebsd.org
Subject:   Re: [REL - 91i386-default][audio/shout-idjc] Failed for libshout-idjc-2.3.1_1 in build
Message-ID:  <20140424194031.68cd60c3@kalimero.tijl.coosemans.org>
In-Reply-To: <1398347539.1923.4.camel@powernoodle.corp.yahoo.com>
References:  <201404232339.s3NNdZoZ022336@beefy1.isc.freebsd.org> <1398314393.1923.1.camel@powernoodle.corp.yahoo.com> <20140424114047.654c263e@kalimero.tijl.coosemans.org> <1398347539.1923.4.camel@powernoodle.corp.yahoo.com>

next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/tRqxPxpDLw_TB/2eya3_Ne3
Content-Type: multipart/mixed; boundary="MP_/L=OqddSWvhvSgDr_UQX2K4o"

--MP_/L=OqddSWvhvSgDr_UQX2K4o
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Thu, 24 Apr 2014 06:52:19 -0700 Sean Bruno wrote:
> On Thu, 2014-04-24 at 11:40 +0200, Tijl Coosemans wrote:
>>> Hrm ... am I supposed to support this on 9.1?  I only targetted 9.2
>>>=20
>>> I guess I should change the o/s check for < 920000 ??
>>=20
>> I think sock.c is just missing an include.  IPPROTO_IPV6 is defined in
>> netinet/in.h on all supported versions of FreeBSD.=20
>=20
> Yup, agreed.  No idea what I'm supposed to include on < 9.2 though.  as
> it works for everything else.

Hmm, it looks like netinet/in.h is already included, but IPPROTO_IPV6
is hidden behind __BSD_VISIBLE in older versions of FreeBSD.
__BSD_VISIBLE isn't defined because the port defines _XOPEN_SOURCE in
config.h and that causes the headers to be strictly standards compliant
(no BSD specific stuff).  In later versions of FreeBSD IPPROTO_IPV6 is
hidden behind __POSIX_VISIBLE which is part of the X/Open standard.

The attached patch fixes this by patching the configure script.
It makes an number of other changes:
- HAS_CONFIGURE -> GNU_CONFIGURE
- USES=3Dlibtool.
- DOCS option.
- Remove GCC requirement.
  (In audio/idjc it is replaced with USES=3Dcompiler:nestedfct)

Redports: https://redports.org/buildarchive/20140424163301-61109/

--MP_/L=OqddSWvhvSgDr_UQX2K4o
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=idjc.patch

Index: audio/shout-idjc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- audio/shout-idjc/Makefile	(revision 352018)
+++ audio/shout-idjc/Makefile	(working copy)
@@ -3,7 +3,7 @@
=20
 PORTNAME=3D	libshout-idjc
 PORTVERSION=3D	2.3.1
-PORTREVISION=3D	1
+PORTREVISION=3D	2
 CATEGORIES=3D	audio python
 MASTER_SITES=3D	SF/idjc/libshout-idjc/
 DISTNAME=3D	${PORTNAME}-${PORTVERSION}
@@ -18,21 +18,15 @@ LIB_DEPENDS=3D	libsamplerate.so:${PORTSDIR
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libspeex.so:${PORTSDIR}/audio/speex
=20
-HAS_CONFIGURE=3D	yes
-USES=3D		pkgconfig pathfix
+GNU_CONFIGURE=3D	yes
+USES=3D		libtool pathfix pkgconfig
 USE_LDCONFIG=3D	yes
=20
-MAKE_JOBS_UNSAFE=3D	no
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=3D	DOCS
=20
-.if ${OSVERSION} < 900000
-BROKEN=3D		audio/shout-idjc IPv6 problem on compile in sock.c
-.endif
+MAKE_JOBS_UNSAFE=3D	yes
=20
-# 10 and higer seem to be fine
-.if ${OSVERSION} < 1000000
-USE_GCC=3D	4.6+
-.endif
+post-patch:
+	@${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/configure
=20
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: audio/shout-idjc/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- audio/shout-idjc/pkg-plist	(revision 352018)
+++ audio/shout-idjc/pkg-plist	(working copy)
@@ -1,12 +1,11 @@
 include/shoutidjc/shout.h
 lib/libshout-idjc.a
-lib/libshout-idjc.la
 lib/libshout-idjc.so
-lib/libshout-idjc.so.5
+lib/libshout-idjc.so.3
+lib/libshout-idjc.so.3.2.0
 libdata/pkgconfig/shout-idjc.pc
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-@dirrmtry %%DOCSDIR%%
-@dirrmtry libdata/pkgconfig
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry include/shoutidjc
Index: audio/idjc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- audio/idjc/Makefile	(revision 352018)
+++ audio/idjc/Makefile	(working copy)
@@ -3,6 +3,7 @@
=20
 PORTNAME=3D	idjc
 PORTVERSION=3D	0.8.14
+PORTREVISION=3D	1
 CATEGORIES=3D	audio python
 MASTER_SITES=3D	SF/idjc/idjc/0.8
=20
@@ -26,24 +27,18 @@ RUN_DEPENDS=3D	oggenc:${PORTSDIR}/audio/vo
 		${PYTHON_PKGNAMEPREFIX}mutagen>=3D0:${PORTSDIR}/audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}dbus>=3D0.8:${PORTSDIR}/devel/py-dbus
=20
-USES=3D			desktop-file-utils gettext gmake pathfix pkgconfig
-CONFIGURE_ENV+=3D		PKG_CONFIG_PATH=3D${LOCALBASE}/lib/pkgconfig
-CONFIGURE_ARGS+=3D	--mandir=3D${MANPREFIX}/man
+USES=3D			compiler:nestedfct desktop-file-utils gettext gmake \
+			libtool pathfix pkgconfig
 MAKE_JOBS_UNSAFE=3D	yes
-HAS_CONFIGURE=3D		yes
+GNU_CONFIGURE=3D		yes
+LDFLAGS+=3D		-L${LOCALBASE}/lib
 USE_PYTHON=3D		2.7
 USE_PYTHON_PREFIX=3D	yes
 USE_GNOME=3D		glib20 pygtk2
-USE_GCC=3D		4.6+
=20
-MANLANG=3D		"" fr it
-PLIST_SUB+=3D		PORTVERSION=3D"${PORTVERSION}"
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=3D	DOCS
=20
-.if ${OSVERSION} < 900000
-BROKEN=3D	audio/shout-idjc IPv6 problem on compile in sock.c
-.endif
+DOCSDIR=3D	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
=20
 pre-install:
 	${REINPLACE_CMD} 's|libvorbis.so.0|libvorbis.so|' \
@@ -51,4 +46,4 @@ pre-install:
 	${REINPLACE_CMD} 's|#! /usr/local/bin/python2.72.7|#\!${LOCALBASE}/bin/${=
PYTHON_VERSION}|' \
 		${WRKSRC}/idjc
=20
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: audio/idjc/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- audio/idjc/pkg-plist	(revision 352018)
+++ audio/idjc/pkg-plist	(working copy)
@@ -1,5 +1,4 @@
 bin/idjc
-lib/idjc/idjc.la
 lib/idjc/idjc.so
 lib/idjc/site-packages/idjc/__init__.py
 lib/idjc/site-packages/idjc/__init__.pyc
@@ -62,10 +61,10 @@ lib/python2.7/site-packages/idjcmonitor.
 lib/python2.7/site-packages/idjcmonitor.pyc
 lib/python2.7/site-packages/idjcmonitor.pyo
 share/applications/idjc.desktop
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/AUTHORS.gz
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/ChangeLog.gz
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/NEWS.gz
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/README.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.gz
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.gz
+%%PORTDOCS%%%%DOCSDIR%%/README.gz
 %%DATADIR%%/add3.png
 %%DATADIR%%/advance.png
 %%DATADIR%%/classic_cross.png
@@ -127,7 +126,7 @@ share/pixmaps/idjc.png
 @dirrmtry man/fr
 @dirrmtry man
 @dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%-%%PORTVERSION%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry lib/python2.7/site-packages
 @dirrmtry lib/python2.7
 @dirrmtry lib/idjc/site-packages/idjc/prelims

--MP_/L=OqddSWvhvSgDr_UQX2K4o--

--Sig_/tRqxPxpDLw_TB/2eya3_Ne3
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)

iF4EAREKAAYFAlNZTJQACgkQfoCS2CCgtisA4AD+IyHPcRK08pPLSxfRwacbJM1W
SCa6uQrlNqoffXWApbgA/j4QfC2JZYkdHS5CBbJb5eFOMwVFkdrvHJaMs4FquP5K
=rLu6
-----END PGP SIGNATURE-----

--Sig_/tRqxPxpDLw_TB/2eya3_Ne3--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140424194031.68cd60c3>