- net/opal * add a patch to avoid the double underscore in the library name now it gets installed as libopal_r.* instead of libopal__r.* * fix pkg-plist to catch all libraries and change to one underscore * add WITH_FFMPEG knob to enable h263avcodec support * add WITH_SPEEX knob to build with speex from audio/speex-devel instead of the bundled version NOTE: there is an explicit BUILD_DEPENDS to make sure audio/speex-devel is installed as audio/speex and audio/speex-devel install the same shared library version!! - net/ekiga * chase the net/opal library name change * let bsd.gnome.mk handle the evolutiondataserver dependency * allow the user to disable avahi support by defining WITHOUT_AVAHI hide the net/avahi dependency inside the knob * allow the user to enable dbus support by defining WITH_DBUS add an explicit dependency on devel/dbus for the case one defines WITHOUT_AVAHI and! WITH_DBUS Fix: - apply the patch - add new file to CVS
State Changed From-To: open->feedback Awaiting maintainers feedback
Hello, Thanks for your patch. However there's a typo in PORTREVISION. -- Jean-Baptiste Quenot aka John Banana Qwerty http://caraldi.com/jbq/
Another question: What is the meaning of NO_FILTER_SHLIBS? It does not appear in the porter's handbook at http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/ Also, why do you patch LDFLAGS in patch-opal_inc.mak? -- Jean-Baptiste Quenot aka John Banana Qwerty http://caraldi.com/jbq/
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Fri, 7 Apr 2006, Jean-Baptiste Quenot wrote: > Hello, > > Thanks for your patch. However there's a typo in PORTREVISION. ups.. sorry for this. in the patch for net/ekiga, PORTEVISION should really be PORTREVISION.. Joerg - -- The beginning is the most important part of the work. -Plato -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (FreeBSD) iD8DBQFENjp2SPOsGF+KA+MRAplPAJ9w2QBBcc3P1wPhY8EmYMQ0hS1nuQCgrtlO 1VzV3KktqbeKVSYKJunvK8U= =aaEl -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 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 at > http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/ > > Also, why do you patch LDFLAGS in patch-opal_inc.mak? 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. 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_SUFFIX) +OPAL_BASE = 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. Please see diff(1) (search for unified) for further informations. regards Joerg - -- The beginning is the most important part of the work. -Plato -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (FreeBSD) iD8DBQFENkBBSPOsGF+KA+MRAnfKAKC2PeT064m0h7+03MnsE2UyTfPdEACfflkD 4+GQlt/yZ4PReeMsBcKSxNE= =JYY1 -----END PGP SIGNATURE-----
* 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, -- Jean-Baptiste Quenot aka John Banana Qwerty http://caraldi.com/jbq/
-----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-----
State Changed From-To: feedback->closed Committed, thanks!