Date: Fri, 7 Apr 2006 11:00:38 GMT From: Joerg Pulz <Joerg.Pulz@frm2.tum.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/95464: net/opal, net/ekiga: avoid double underscore in the library name, ... Message-ID: <200604071100.k37B0cu0015218@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/95464; it has been noted by GNATS.
From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: Jean-Baptiste Quenot <jbq@caraldi.com>
Cc: Joerg Pulz <Joerg.Pulz@frm2.tum.de>, bug-followup@FreeBSD.org
Subject: Re: ports/95464: net/opal, net/ekiga: avoid double underscore in
the library name, ...
Date: Fri, 7 Apr 2006 12:57:14 +0200 (CEST)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Fri, 7 Apr 2006, Jean-Baptiste Quenot wrote:
> * Joerg Pulz:
>
>> On Fri, 7 Apr 2006, Jean-Baptiste Quenot wrote:
>>
>>> Another question:
>>>
>>> What is the meaning of NO_FILTER_SHLIBS?
>>>
>>> It does not appear in the porter's handbook
>>
>> In FreeBSD, all libraries are normally have only a major version
>> number. To prevent from any shlib name modification (e.g. minor
>> number removal) by bsd.port.mk the ports Makefile should use
>> NO_FILTER_SHLIBS=yes . See x11-toolkits/qt33, net/openh323 or
>> devel/pwlib which install shared libraries with long names
>> (lib<name>.so.<major>.<minor>.<patchlevel>) too.
>
> OK I will submit a patch against the porter's handbook for that.
>
>>> Also, why do you patch LDFLAGS in patch-opal_inc.mak?
>
>> If you could take a closer look into the patch-opal_inc.mak
>> again, you will surely find out, that the only line that gets
>> changed is this one:
>>
>> - -OPAL_BASE = opal_$(PLATFORM_TYPE) +OPAL_BASE =_$(OPAL_SUFFIX)
>> opal _$(OPAL_SUFFIX)
>>
>> Probably it loks like the LDFLAGS line gets chenged as the diff
>> is a unified diff and this typically includes 3 lines before and
>> 3 lines after the changed line.
>
> Oh, sorry you're right.
>
> Could you please resubmit your patch with the PORTREVISION typed
> correctly?
>
> Thanks for your help,
>
Ok, there it is.
So please forget about the net_ekiga.diff from the PR, instead use the one
appended to this mail.
regards
Joerg
- --
The beginning is the most important part of the work.
-Plato
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ekiga/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
- --- Makefile 6 Apr 2006 13:04:59 -0000 1.57
+++ Makefile 7 Apr 2006 08:43:41 -0000
@@ -7,6 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
@@ -14,15 +15,14 @@
MAINTAINER= jbq@caraldi.com
COMMENT= VoIP phone for Gnome
- -LIB_DEPENDS= opal__r.2:${PORTSDIR}/net/opal \
- - avahi-core.4:${PORTSDIR}/net/avahi \
- - ebook-1.2.5:${PORTSDIR}/databases/evolution-data-server
+LIB_DEPENDS= opal_r.2:${PORTSDIR}/net/opal
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_SDL= sdl
- -USE_GNOME= libgnomeui libbonobo gnomeprefix gnomehack gnomelibs gnomedocutils
+USE_GNOME= libgnomeui libbonobo gnomeprefix gnomehack gnomelibs \
+ gnomedocutils evolutiondataserver
USE_AUTOTOOLS= libtool:15
LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV= SDL_CONFIG=${LOCALBASE}/bin/sdl11-config LDFLAGS="${LDFLAGS}"
@@ -33,4 +33,20 @@
GCONF_SCHEMAS= ekiga.schemas
MAN1= ekiga.1
- -.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.ifndef (WITHOUT_AVAHI)
+LIB_DEPENDS+= avahi-core.4:${PORTSDIR}/net/avahi
+CONFIGURE_ARGS+= --enable-avahi
+.else
+CONFIGURE_ARGS+= --disable-avahi
+.endif
+
+.ifdef (WITH_DBUS)
+LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+= --enable-dbus
+.else
+CONFIGURE_ARGS+= --disable-dbus
+.endif
+
+.include <bsd.port.post.mk>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)
iD8DBQFENkWNSPOsGF+KA+MRAuhqAJ0ZCzKK9A3/PdYY4W75EWsjl/84KQCg0I1x
u/emjcHwrz9zSBV8ZJZqKWg=
=h2dW
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604071100.k37B0cu0015218>