Re: update: git; sets sysconfdir
> On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
>
>> Or should we patch all references of lowercase sysconfdir to uppercase
>> them? :P
>
> No, this looks fine as is, thanks.
> I think this is the most correct solution, benoit?
>
ok for me !
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/git/Makefile,v
>> retrieving revision 1.80
>> diff -u -r1.80 Makefile
>> --- Makefile30 Jul 2011 05:08:05 - 1.80
>> +++ Makefile29 Aug 2011 16:49:33 -
>> @@ -11,7 +11,7 @@
>> PKGNAME-x11 = git-x11-${V}
>> CATEGORIES = devel
>>
>> -REVISION = 0
>> +REVISION = 1
>>
>> HOMEPAGE = http://git-scm.com/
>>
>> @@ -67,7 +67,7 @@
>> PKG_ARCH-x11 = *
>>
>> MAKE_ENV = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}"
>> V=1 \
>> - SYSCONFDIR=${SYSCONFDIR} \
>> + sysconfdir=${SYSCONFDIR} \
>> TCLTK_PATH=${MODTK_BIN} \
>> TCL_PATH=${MODTCL_BIN} \
>> REGRESS_SHELL=${LOCALBASE}/bin/bash
>>
>> --
>> DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
>> This message will self-destruct in 3 seconds.
>>
>
> --
> Antoine
>
>
>
Até 85% OFF em Paintball + Filé de Peixe à Urucum + Peeling de Diamante + Salgados Congelados + Escova Progressiva
www.incriveisofertas.com [IMAGE]2� Round!!! 1h de Paintball + 100 Bolinhas + Equipamento com 50% de desconto no Danger Zone Paintball! Divers�o garantida de R$20,00 por R$9,99! de R$ 20,00 por R$ R$ 9,99 [IMAGE]� de dar �gua na boca! 1 Kg de Fil� de Peixe � Urucum Congelado de R$ 43,00 por apenas R$ 18,90 no Banana da Terra Restaurante e Pizzaria. (56% OFF) de R$ 43,00 por R$ R$ 18,90 [IMAGE]Ilumine sua Pele! Peeling de Diamante + Limpeza de Pele + Hidrata��o Facial da Vitaderm ( de R$ 170,00 por R$ 34,90 ) At� 3 Cupons e 2 meses para uso. de R$ 170,00 por R$ R$ 34,90 [IMAGE]VII Jornada acad�mica de Medicina da Uniderp de R$ 45,00 por R$ R$ 45,00 [IMAGE]VII Jornada acad�mica de Medicina da Uniderp - Virtual de R$ 45,00 por R$ R$ 45,00 [IMAGE]Depila��o Agora! Virilha Completa + Bu�o + Axilas, de R$ 33,00 por R$ 9,99. Aproveite s�o 70% de desconto de R$ 33,00 por R$ R$ 9,99 [IMAGE]100 Salgados Sortidos de Esfira/P�o Italiano pr�-assados Congelados pela Metade do Pre�o (de R$40 por R$19,90) de R$ 40,00 por R$ R$ 19,90 [IMAGE]85% de desconto em Escova Progressiva Eco Plus + Hidrata��o ANEETHUN � na Rosi Studio Hair (de R$320,00 por R$49,90) At� 3 Cupons/5 meses de uso. de R$ 320,00 por R$ R$ 49,90 [IMAGE] Não desejo mais receber estes e-mails.
Re: update: git; sets sysconfdir
On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> Or should we patch all references of lowercase sysconfdir to uppercase
> them? :P
No, this looks fine as is, thanks.
I think this is the most correct solution, benoit?
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.80
> diff -u -r1.80 Makefile
> --- Makefile30 Jul 2011 05:08:05 - 1.80
> +++ Makefile29 Aug 2011 16:49:33 -
> @@ -11,7 +11,7 @@
> PKGNAME-x11 = git-x11-${V}
> CATEGORIES = devel
>
> -REVISION = 0
> +REVISION = 1
>
> HOMEPAGE = http://git-scm.com/
>
> @@ -67,7 +67,7 @@
> PKG_ARCH-x11 = *
>
> MAKE_ENV = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
> - SYSCONFDIR=${SYSCONFDIR} \
> + sysconfdir=${SYSCONFDIR} \
> TCLTK_PATH=${MODTK_BIN} \
> TCL_PATH=${MODTCL_BIN} \
> REGRESS_SHELL=${LOCALBASE}/bin/bash
>
> --
> DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
> This message will self-destruct in 3 seconds.
>
--
Antoine
Re: update: git; sets sysconfdir
Antoine Jacoutot wrote:
> On Mon, 29 Aug 2011, Brad wrote:
> > On 29/08/11 6:29 AM, Antoine Jacoutot wrote:
> > > On Mon, 29 Aug 2011, Brad wrote:
> > >
> > > > On 29/08/11 6:10 AM, Antoine Jacoutot wrote:
> > > > > On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> > > > >
> > > > > > Antoine Jacoutot wrote:
> > > > > >
> > > > > > > You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Antoine
> > > > > > >
> > > > > >
> > > > > > I'm sure I was missing something...
> > > > > >
> > > > > > Reroll diff:
> > > > >
> > > > > Can't the port just use CONFIGURE_STYLE=gnu so that
> > > > > --sysconfdir=${SYSCONFDIR} is passed to configure?
> > > >
> > > > Not when there isn't any necessity to do so. The second diff is fine.
> > >
> > > Care to explain? Why patching when setting a variable is enough.
> > > Please extend.
> >
> > Yes. dragging in the alternative build system and thus autoconf
> > vs adding the one extra line to the Makefile is ridiculous. Why
> > add a whole run of autoconf to set ONE variable in a Makefile?
>
> Then why not use sysconfdir=${SYSCONFDIR} in MAKE_ENV or FLAGS instead
> of patching?
>
> --
> Antoine
According to grep -R SYSCONFDIR, SYSCONFDIR is used nowhere, this works
and is tested on amd64.
Or should we patch all references of lowercase sysconfdir to uppercase
them? :P
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- Makefile30 Jul 2011 05:08:05 - 1.80
+++ Makefile29 Aug 2011 16:49:33 -
@@ -11,7 +11,7 @@
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://git-scm.com/
@@ -67,7 +67,7 @@
PKG_ARCH-x11 = *
MAKE_ENV = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
- SYSCONFDIR=${SYSCONFDIR} \
+ sysconfdir=${SYSCONFDIR} \
TCLTK_PATH=${MODTK_BIN} \
TCL_PATH=${MODTCL_BIN} \
REGRESS_SHELL=${LOCALBASE}/bin/bash
--
DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
This message will self-destruct in 3 seconds.
Re: update: git; sets sysconfdir
On Mon, Aug 29, 2011 at 5:38 AM, Antoine Jacoutot wrote:
> On Mon, 29 Aug 2011, Brad wrote:
>> On 29/08/11 6:29 AM, Antoine Jacoutot wrote:
>> > On Mon, 29 Aug 2011, Brad wrote:
>> >
>> > > On 29/08/11 6:10 AM, Antoine Jacoutot wrote:
>> > > > On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
>> > > >
>> > > > > Antoine Jacoutot wrote:
>> > > > >
>> > > > > > You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
>> > > > > >
>> > > > > >
>> > > > > > --
>> > > > > > Antoine
>> > > > > >
>> > > > >
>> > > > > I'm sure I was missing something...
>> > > > >
>> > > > > Reroll diff:
>> > > >
>> > > > Can't the port just use CONFIGURE_STYLE=gnu so that
>> > > > --sysconfdir=${SYSCONFDIR} is passed to configure?
>> > >
>> > > Not when there isn't any necessity to do so. The second diff is fine.
>> >
>> > Care to explain? Why patching when setting a variable is enough.
>> > Please extend.
>>
>> Yes. dragging in the alternative build system and thus autoconf
>> vs adding the one extra line to the Makefile is ridiculous. Why
>> add a whole run of autoconf to set ONE variable in a Makefile?
>
> Then why not use sysconfdir=${SYSCONFDIR} in MAKE_ENV or FLAGS instead
> of patching?
>
> --
> Antoine
>
There is already SYSCONFDIR=${SYSCONFDIR}, let me try it lowercased...
Eliminate mention of xz/sparc issues in bsd.port.mk.5
bsd.port.mk no longer warns about xz/sparc issues, so it seems like
bsd.port.mk.5 shouldn't need to either.
ok?
Index: bsd.port.mk.5
===
RCS file: /home/mdempsky/anoncvs/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.284
diff -u -p -r1.284 bsd.port.mk.5
--- bsd.port.mk.5 15 Jul 2011 23:11:59 - 1.284
+++ bsd.port.mk.5 29 Aug 2011 16:21:56 -
@@ -1130,7 +1130,7 @@ do
done
.Ed
The use of xz archives is discouraged, as it makes things impossible to
-build on vax and very annoying on sparc.
+build on vax.
.It Ev EXTRACT_ONLY
Set if not all ${DISTFILES} should be extracted at do-extract stage.
Default value is ${DISTFILES}.
Re: x11/e17 [edje] bad curl version
> Ports -current. > Package builds fine, but won't install. > > ===> Installing edje-1.0.0v2 from /usr/ports/packages/amd64/all/ > Can't install edje-1.0.0v2 because of libraries > |library curl.18.0 not found > | /usr/local/lib/libcurl.so.19.0 (curl-7.21.7): bad major that's the answer right there... libcurl.so.18.0 vs libcurl.so.19.0, you have upgraded curl. you don't have all current packages, some are partially upgraded and some are not.
x11/e17 [edje] bad curl version
Ports -current. Package builds fine, but won't install. ===> Installing edje-1.0.0v2 from /usr/ports/packages/amd64/all/ Can't install edje-1.0.0v2 because of libraries |library curl.18.0 not found | /usr/local/lib/libcurl.so.19.0 (curl-7.21.7): bad major Direct dependencies for edje-1.0.0v2 resolve to embryo-1.0.0v2 lua-5.1.4p2 ecore-1.0.0v2 shared-mime-info-0.90 gettext-0.18.1p0 libiconv-1.13p2 Full dependency tree is eet-1.4.0v2 cairo-1.10.2p1 curl-7.21.7 libcroco-0.6.2p1 libxml-2.7.8p2 libungif-4.1.4p1 libgamin-0.1.10p4 jpeg-8c evas-1.0.0v2 libiconv-1.13p2 eina-1.0.0v1 jasper-1.900.1p1 gdk-pixbuf-2.23.5 librsvg-2.34.0p2 libidn-1.22 gettext-0.18.1p0 embryo-1.0.0v2 lua-5.1.4p2 png-1.5.4 glib2-2.28.8p3 pcre-8.12p0 shared-mime-info-0.90 pango-1.28.4p2 ecore-1.0.0v2 tiff-3.9.5 libcares-1.7.4 *** Error code 1 Stop in /usr/ports/x11/e17/edje (line 1730 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/edje (line 2250 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 1892 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 2309 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 1699 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 2270 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 2250 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 1730 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/e17/e (line 2250 of /usr/ports/infrastructure/mk/bsd.port.mk). ===> Exiting x11/e17/e with an error *** Error code 1 Stop in /usr/ports/x11/e17 (line 138 of /usr/ports/infrastructure/mk/bsd.port.subdir.mk). -- Francis Dos Santos -- http://www.fastmail.fm - Or how I learned to stop worrying and love email again
Re: [Update]textproc/p5-XML-LibXML
Thanks. New patch below. Ok?
On Mon, Aug 29, 2011 at 09:46:34AM -0300, Gleydson Soares wrote:
> On Mon, Aug 29, 2011 at 8:38 AM, Mikolaj Kucharski
> wrote:
> > One more request Wen, if you could add:
> >
> > REGRESS_DEPENDS= devel/p5-Test-Pod
>
> if suite test requires p5-Tes-Pod, use like it:
> MAKE_ENV+=TEST_POD=1
>
> >
> > that would be look good to me. All regress tests pass.
Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-XML-LibXML/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile5 Jan 2011 18:18:25 - 1.36
+++ Makefile29 Aug 2011 14:52:30 -
@@ -4,14 +4,13 @@
COMMENT= perl interface to the libxml2 library
-DISTNAME= XML-LibXML-1.69
+DISTNAME= XML-LibXML-1.84
EPOCH= 0
CATEGORIES=textproc
-USE_GROFF =Yes
LIB_DEPENDS= textproc/libxml
-RUN_DEPENDS= textproc/p5-LibXML-Common \
- textproc/p5-XML-SAX
+RUN_DEPENDS= textproc/p5-XML-NamespaceSupport>=1.07 \
+ textproc/p5-XML-SAX>=0.11
BUILD_DEPENDS= ${RUN_DEPENDS}
# GPL/Artistic
@@ -23,6 +22,8 @@
MODULES= cpan \
converters/libiconv
-WANTLIB= m z xml2>=6
+WANTLIB= m z xml2>=7
+
+MAKE_ENV= TEST_POD=1
.include
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-XML-LibXML/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo8 Dec 2008 15:18:20 - 1.11
+++ distinfo29 Aug 2011 14:52:30 -
@@ -1,5 +1,5 @@
-MD5 (XML-LibXML-1.69.tar.gz) = gpX0rnsJcpmF3REz460NCg==
-RMD160 (XML-LibXML-1.69.tar.gz) = G6nl1jQxrhEDH8oY4o2l8E/iXyM=
-SHA1 (XML-LibXML-1.69.tar.gz) = qFkK2mRj47HeVpn3uKFLVkQ3ohM=
-SHA256 (XML-LibXML-1.69.tar.gz) = x9zDKgYXjFNCW3FShr6FMxuBm5thIRoDlrCOhek3H9E=
-SIZE (XML-LibXML-1.69.tar.gz) = 312095
+MD5 (XML-LibXML-1.84.tar.gz) = 3mqS8dJVh1R9xucN7HQokw==
+RMD160 (XML-LibXML-1.84.tar.gz) = YC7bEa8/MZZWjUlBC3kxLC05DiM=
+SHA1 (XML-LibXML-1.84.tar.gz) = dtEReWfM6S34pT6C3cqFmsqA/i8=
+SHA256 (XML-LibXML-1.84.tar.gz) = MOzUvnm2t/NNjhcYDeg8DBJmf9oHFIDmDFzjMWTZuwQ=
+SIZE (XML-LibXML-1.84.tar.gz) = 429541
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/textproc/p5-XML-LibXML/patches/patch-Makefile_PL,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_PL
--- patches/patch-Makefile_PL 7 Nov 2006 18:16:02 - 1.4
+++ patches/patch-Makefile_PL 29 Aug 2011 14:52:30 -
@@ -1,13 +1,13 @@
Makefile.PL.orig Sun Sep 24 17:27:58 2006
-+++ Makefile.PLMon Nov 6 18:30:01 2006
-@@ -314,8 +314,8 @@ sub MY::install {
+--- Makefile.PL.orig Wed Aug 17 21:27:36 2011
Makefile.PLWed Aug 17 21:28:05 2011
+@@ -387,8 +387,8 @@ sub MY::install {
$script .= <<"INSTALL";
install_sax_driver :
--\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
--\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
-+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
-+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
+-\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
+-\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
++#\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
++#\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
"XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
INSTALL
} else {
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/p5-XML-LibXML/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- pkg/PLIST 8 Dec 2008 15:18:20 - 1.17
+++ pkg/PLIST 29 Aug 2011 14:52:30 -
@@ -1,10 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.17 2008/12/08 15:18:20 simon Exp $
+@comment $OpenBSD$
+@pkgpath textproc/p5-LibXML-Common
+@conflict p5-XML-LibXML-Common-*
+${P5ARCH}/
+${P5ARCH}/XML/
+${P5ARCH}/XML/LibXML/
${P5ARCH}/XML/LibXML.pm
${P5ARCH}/XML/LibXML.pod
${P5ARCH}/XML/LibXML/Attr.pod
${P5ARCH}/XML/LibXML/Boolean.pm
${P5ARCH}/XML/LibXML/CDATASection.pod
${P5ARCH}/XML/LibXML/Comment.pod
+${P5ARCH}/XML/LibXML/Common.pm
+${P5ARCH}/XML/LibXML/Common.pod
${P5ARCH}/XML/LibXML/DOM.pod
${P5ARCH}/XML/LibXML/Document.pod
${P5ARCH}/XML/LibXML/DocumentFragment.pod
@@ -25,6 +32,7 @@
${P5ARCH}/XML/LibXML/Pattern.pod
${P5ARCH}/XML/LibXML/Reader.pm
${P5ARCH}/XML/LibXML/Reader
Re: [Update]textproc/p5-XML-LibXML
On Mon, Aug 29, 2011 at 8:38 AM, Mikolaj Kucharski
wrote:
> One more request Wen, if you could add:
>
> REGRESS_DEPENDS= devel/p5-Test-Pod
if suite test requires p5-Tes-Pod, use like it:
MAKE_ENV+=TEST_POD=1
>
> that would be look good to me. All regress tests pass.
>
> Regards,
> Mikolaj
>
> On Sat, Aug 20, 2011 at 04:40:26PM +0800, wen heping wrote:
>> Revised again again.
>>
>> Comments?
>>
>> wen
>>
>> 2011/8/19 Mikolaj Kucharski :
>> > On Fri, Aug 19, 2011 at 10:29:17PM +0800, wen heping wrote:
>> >> Revised again.
>> >>
>> >> Comments?
>> >>
>> >> wen
>> >
>> > Much better, but you still didn't include @pkgpath marker in PLIST, that
>> > should look like:
>> >
>> > @pkgpath textproc/p5-LibXML-Common
>> >
>> > also, personally I would bump WANTLIB for xml2 to the same value like in
>> > textproc/p5-LibXML-Common so:
>> >
>> > WANTLIB= m z xml2>=7
>> >
>> > but it's probably not stricly needed at this stage, as in ports version
>> > of libxml has so major number set to 12. Other porters may comment here.
>> > I would just keep it consistent.
>> >
>> > I cannot comment about $(INSTALLSITEARCH) patch, but I assume it's
>> > needed.
>> >
>> >
>> > Just to be clear, if you want to remove textproc/p5-LibXML-Common from
>> > the tree because this module was merged into textproc/p5-XML-LibXML you
>> > need *both* conflict and pkgpath markers in p5-XML-LibXML's PLIST.
>> >
>> >
>> > --
>> > best regards
>> > q#
>> >
>> >
>
>> Index: p5-XML-LibXML/Makefile
>> ===
>> RCS file: /cvs/ports/textproc/p5-XML-LibXML/Makefile,v
>> retrieving revision 1.36
>> diff -u -p -r1.36 Makefile
>> --- p5-XML-LibXML/Makefile 5 Jan 2011 18:18:25 - 1.36
>> +++ p5-XML-LibXML/Makefile 20 Aug 2011 08:37:02 -
>> @@ -4,14 +4,13 @@ SHARED_ONLY= Yes
>>
>> COMMENT= perl interface to the libxml2 library
>>
>> -DISTNAME= XML-LibXML-1.69
>> +DISTNAME= XML-LibXML-1.84
>> EPOCH= 0
>> CATEGORIES= textproc
>> -USE_GROFF = Yes
>>
>> LIB_DEPENDS= textproc/libxml
>> -RUN_DEPENDS= textproc/p5-LibXML-Common \
>> - textproc/p5-XML-SAX
>> +RUN_DEPENDS= textproc/p5-XML-NamespaceSupport>=1.07 \
>> + textproc/p5-XML-SAX>=0.11
>> BUILD_DEPENDS= ${RUN_DEPENDS}
>>
>> # GPL/Artistic
>> @@ -23,6 +22,6 @@ PERMIT_DISTFILES_FTP= Yes
>> MODULES= cpan \
>> converters/libiconv
>>
>> -WANTLIB= m z xml2>=6
>> +WANTLIB= m z xml2>=7
>>
>> .include
>> Index: p5-XML-LibXML/distinfo
>> ===
>> RCS file: /cvs/ports/textproc/p5-XML-LibXML/distinfo,v
>> retrieving revision 1.11
>> diff -u -p -r1.11 distinfo
>> --- p5-XML-LibXML/distinfo 8 Dec 2008 15:18:20 - 1.11
>> +++ p5-XML-LibXML/distinfo 20 Aug 2011 08:37:02 -
>> @@ -1,5 +1,5 @@
>> -MD5 (XML-LibXML-1.69.tar.gz) = gpX0rnsJcpmF3REz460NCg==
>> -RMD160 (XML-LibXML-1.69.tar.gz) = G6nl1jQxrhEDH8oY4o2l8E/iXyM=
>> -SHA1 (XML-LibXML-1.69.tar.gz) = qFkK2mRj47HeVpn3uKFLVkQ3ohM=
>> -SHA256 (XML-LibXML-1.69.tar.gz) =
>> x9zDKgYXjFNCW3FShr6FMxuBm5thIRoDlrCOhek3H9E=
>> -SIZE (XML-LibXML-1.69.tar.gz) = 312095
>> +MD5 (XML-LibXML-1.84.tar.gz) = 3mqS8dJVh1R9xucN7HQokw==
>> +RMD160 (XML-LibXML-1.84.tar.gz) = YC7bEa8/MZZWjUlBC3kxLC05DiM=
>> +SHA1 (XML-LibXML-1.84.tar.gz) = dtEReWfM6S34pT6C3cqFmsqA/i8=
>> +SHA256 (XML-LibXML-1.84.tar.gz) =
>> MOzUvnm2t/NNjhcYDeg8DBJmf9oHFIDmDFzjMWTZuwQ=
>> +SIZE (XML-LibXML-1.84.tar.gz) = 429541
>> Index: p5-XML-LibXML/patches/patch-Makefile_PL
>> ===
>> RCS file: /cvs/ports/textproc/p5-XML-LibXML/patches/patch-Makefile_PL,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 patch-Makefile_PL
>> --- p5-XML-LibXML/patches/patch-Makefile_PL 7 Nov 2006 18:16:02 -
>> 1.4
>> +++ p5-XML-LibXML/patches/patch-Makefile_PL 20 Aug 2011 08:37:02 -
>> @@ -1,13 +1,13 @@
>> Makefile.PL.orig Sun Sep 24 17:27:58 2006
>> -+++ Makefile.PL Mon Nov 6 18:30:01 2006
>> -@@ -314,8 +314,8 @@ sub MY::install {
>> +--- Makefile.PL.orig Wed Aug 17 21:27:36 2011
>> Makefile.PL Wed Aug 17 21:28:05 2011
>> +@@ -387,8 +387,8 @@ sub MY::install {
>> $script .= <<"INSTALL";
>>
>> install_sax_driver :
>> --\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
>> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
>> --\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
>> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
>> -+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
>> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
>> -+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
>> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
>> +-\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
>> "XML::SAX->add_parser(q(XML::LibXML::SAX::Pa
Re: [Update]textproc/p5-XML-LibXML
One more request Wen, if you could add:
REGRESS_DEPENDS=devel/p5-Test-Pod
that would be look good to me. All regress tests pass.
Regards,
Mikolaj
On Sat, Aug 20, 2011 at 04:40:26PM +0800, wen heping wrote:
> Revised again again.
>
> Comments?
>
> wen
>
> 2011/8/19 Mikolaj Kucharski :
> > On Fri, Aug 19, 2011 at 10:29:17PM +0800, wen heping wrote:
> >> Revised again.
> >>
> >> Comments?
> >>
> >> wen
> >
> > Much better, but you still didn't include @pkgpath marker in PLIST, that
> > should look like:
> >
> > @pkgpath textproc/p5-LibXML-Common
> >
> > also, personally I would bump WANTLIB for xml2 to the same value like in
> > textproc/p5-LibXML-Common so:
> >
> > WANTLIB= m z xml2>=7
> >
> > but it's probably not stricly needed at this stage, as in ports version
> > of libxml has so major number set to 12. Other porters may comment here.
> > I would just keep it consistent.
> >
> > I cannot comment about $(INSTALLSITEARCH) patch, but I assume it's
> > needed.
> >
> >
> > Just to be clear, if you want to remove textproc/p5-LibXML-Common from
> > the tree because this module was merged into textproc/p5-XML-LibXML you
> > need *both* conflict and pkgpath markers in p5-XML-LibXML's PLIST.
> >
> >
> > --
> > best regards
> > q#
> >
> >
> Index: p5-XML-LibXML/Makefile
> ===
> RCS file: /cvs/ports/textproc/p5-XML-LibXML/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- p5-XML-LibXML/Makefile5 Jan 2011 18:18:25 - 1.36
> +++ p5-XML-LibXML/Makefile20 Aug 2011 08:37:02 -
> @@ -4,14 +4,13 @@ SHARED_ONLY=Yes
>
> COMMENT= perl interface to the libxml2 library
>
> -DISTNAME=XML-LibXML-1.69
> +DISTNAME=XML-LibXML-1.84
> EPOCH= 0
> CATEGORIES= textproc
> -USE_GROFF = Yes
>
> LIB_DEPENDS= textproc/libxml
> -RUN_DEPENDS= textproc/p5-LibXML-Common \
> - textproc/p5-XML-SAX
> +RUN_DEPENDS= textproc/p5-XML-NamespaceSupport>=1.07 \
> + textproc/p5-XML-SAX>=0.11
> BUILD_DEPENDS= ${RUN_DEPENDS}
>
> # GPL/Artistic
> @@ -23,6 +22,6 @@ PERMIT_DISTFILES_FTP= Yes
> MODULES= cpan \
> converters/libiconv
>
> -WANTLIB= m z xml2>=6
> +WANTLIB= m z xml2>=7
>
> .include
> Index: p5-XML-LibXML/distinfo
> ===
> RCS file: /cvs/ports/textproc/p5-XML-LibXML/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- p5-XML-LibXML/distinfo8 Dec 2008 15:18:20 - 1.11
> +++ p5-XML-LibXML/distinfo20 Aug 2011 08:37:02 -
> @@ -1,5 +1,5 @@
> -MD5 (XML-LibXML-1.69.tar.gz) = gpX0rnsJcpmF3REz460NCg==
> -RMD160 (XML-LibXML-1.69.tar.gz) = G6nl1jQxrhEDH8oY4o2l8E/iXyM=
> -SHA1 (XML-LibXML-1.69.tar.gz) = qFkK2mRj47HeVpn3uKFLVkQ3ohM=
> -SHA256 (XML-LibXML-1.69.tar.gz) =
> x9zDKgYXjFNCW3FShr6FMxuBm5thIRoDlrCOhek3H9E=
> -SIZE (XML-LibXML-1.69.tar.gz) = 312095
> +MD5 (XML-LibXML-1.84.tar.gz) = 3mqS8dJVh1R9xucN7HQokw==
> +RMD160 (XML-LibXML-1.84.tar.gz) = YC7bEa8/MZZWjUlBC3kxLC05DiM=
> +SHA1 (XML-LibXML-1.84.tar.gz) = dtEReWfM6S34pT6C3cqFmsqA/i8=
> +SHA256 (XML-LibXML-1.84.tar.gz) =
> MOzUvnm2t/NNjhcYDeg8DBJmf9oHFIDmDFzjMWTZuwQ=
> +SIZE (XML-LibXML-1.84.tar.gz) = 429541
> Index: p5-XML-LibXML/patches/patch-Makefile_PL
> ===
> RCS file: /cvs/ports/textproc/p5-XML-LibXML/patches/patch-Makefile_PL,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile_PL
> --- p5-XML-LibXML/patches/patch-Makefile_PL 7 Nov 2006 18:16:02 -
> 1.4
> +++ p5-XML-LibXML/patches/patch-Makefile_PL 20 Aug 2011 08:37:02 -
> @@ -1,13 +1,13 @@
> Makefile.PL.orig Sun Sep 24 17:27:58 2006
> -+++ Makefile.PL Mon Nov 6 18:30:01 2006
> -@@ -314,8 +314,8 @@ sub MY::install {
> +--- Makefile.PL.orig Wed Aug 17 21:27:36 2011
> Makefile.PL Wed Aug 17 21:28:05 2011
> +@@ -387,8 +387,8 @@ sub MY::install {
>$script .= <<"INSTALL";
>
> install_sax_driver :
> --\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> --\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
> -+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> -+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
> +-\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> +-\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
> ++#\t\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->a
Re: update: git; sets sysconfdir
On Mon, 29 Aug 2011, Brad wrote:
> On 29/08/11 6:29 AM, Antoine Jacoutot wrote:
> > On Mon, 29 Aug 2011, Brad wrote:
> >
> > > On 29/08/11 6:10 AM, Antoine Jacoutot wrote:
> > > > On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> > > >
> > > > > Antoine Jacoutot wrote:
> > > > >
> > > > > > You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Antoine
> > > > > >
> > > > >
> > > > > I'm sure I was missing something...
> > > > >
> > > > > Reroll diff:
> > > >
> > > > Can't the port just use CONFIGURE_STYLE=gnu so that
> > > > --sysconfdir=${SYSCONFDIR} is passed to configure?
> > >
> > > Not when there isn't any necessity to do so. The second diff is fine.
> >
> > Care to explain? Why patching when setting a variable is enough.
> > Please extend.
>
> Yes. dragging in the alternative build system and thus autoconf
> vs adding the one extra line to the Makefile is ridiculous. Why
> add a whole run of autoconf to set ONE variable in a Makefile?
Then why not use sysconfdir=${SYSCONFDIR} in MAKE_ENV or FLAGS instead
of patching?
--
Antoine
Re: update: git; sets sysconfdir
On Mon, 29 Aug 2011, Brad wrote: > On 29/08/11 6:20 AM, Abel Abraham Camarillo Ojeda wrote: > > Maybe... I'm unsure why the release tarball ships with a Makefile... if > > there is > > a reason... > > There is.. try reading INSTALL. You mean this? " Alternatively you can use autoconf generated ./configure script to set up install paths (via config.mak.autogen), so you can write instead $ make configure ;# as yourself $ ./configure --prefix=/usr ;# as yourself $ make all doc ;# as yourself # make install install-doc install-html;# as root " -- Antoine
Re: update: git; sets sysconfdir
On 29/08/11 6:29 AM, Antoine Jacoutot wrote:
On Mon, 29 Aug 2011, Brad wrote:
On 29/08/11 6:10 AM, Antoine Jacoutot wrote:
On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
Antoine Jacoutot wrote:
You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
--
Antoine
I'm sure I was missing something...
Reroll diff:
Can't the port just use CONFIGURE_STYLE=gnu so that
--sysconfdir=${SYSCONFDIR} is passed to configure?
Not when there isn't any necessity to do so. The second diff is fine.
Care to explain? Why patching when setting a variable is enough.
Please extend.
Yes. dragging in the alternative build system and thus autoconf
vs adding the one extra line to the Makefile is ridiculous. Why
add a whole run of autoconf to set ONE variable in a Makefile?
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: update: git; sets sysconfdir
On Mon, 29 Aug 2011, Brad wrote:
> On 29/08/11 6:10 AM, Antoine Jacoutot wrote:
> > On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> >
> > > Antoine Jacoutot wrote:
> > >
> > > > You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
> > > >
> > > >
> > > > --
> > > > Antoine
> > > >
> > >
> > > I'm sure I was missing something...
> > >
> > > Reroll diff:
> >
> > Can't the port just use CONFIGURE_STYLE=gnu so that
> > --sysconfdir=${SYSCONFDIR} is passed to configure?
>
> Not when there isn't any necessity to do so. The second diff is fine.
Care to explain? Why patching when setting a variable is enough.
Please extend.
--
Antoine
Re: update: git; sets sysconfdir
On 29/08/11 6:20 AM, Abel Abraham Camarillo Ojeda wrote: Maybe... I'm unsure why the release tarball ships with a Makefile... if there is a reason... There is.. try reading INSTALL. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: update: git; sets sysconfdir
On 29/08/11 6:10 AM, Antoine Jacoutot wrote:
On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
Antoine Jacoutot wrote:
You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
--
Antoine
I'm sure I was missing something...
Reroll diff:
Can't the port just use CONFIGURE_STYLE=gnu so that
--sysconfdir=${SYSCONFDIR} is passed to configure?
Not when there isn't any necessity to do so. The second diff is fine.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: update: git; sets sysconfdir
On Mon, Aug 29, 2011 at 5:10 AM, Antoine Jacoutot wrote:
> On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
>
>> Antoine Jacoutot wrote:
>>
>> > You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
>> >
>> >
>> > --
>> > Antoine
>> >
>>
>> I'm sure I was missing something...
>>
>> Reroll diff:
>
> Can't the port just use CONFIGURE_STYLE=gnu so that
> --sysconfdir=${SYSCONFDIR} is passed to configure?
>
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/git/Makefile,v
>> retrieving revision 1.80
>> diff -u -r1.80 Makefile
>> --- Makefile 30 Jul 2011 05:08:05 - 1.80
>> +++ Makefile 29 Aug 2011 09:06:31 -
>> @@ -11,7 +11,7 @@
>> PKGNAME-x11 = git-x11-${V}
>> CATEGORIES = devel
>>
>> -REVISION = 0
>> +REVISION = 1
>>
>> HOMEPAGE = http://git-scm.com/
>>
>> Index: patches/patch-Makefile
>> ===
>> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
>> retrieving revision 1.32
>> diff -u -r1.32 patch-Makefile
>> --- patches/patch-Makefile 24 Jul 2011 16:29:30 - 1.32
>> +++ patches/patch-Makefile 29 Aug 2011 09:56:17 -
>> @@ -1,7 +1,7 @@
>> $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
>> Makefile.orig Mon Jun 27 00:26:13 2011
>> -+++ Makefile Sat Jul 16 14:44:47 2011
>> -@@ -271,7 +271,7 @@
>> +--- Makefile.orig Sun Jun 26 17:26:13 2011
>> Makefile Mon Aug 29 03:46:06 2011
>> +@@ -271,7 +271,7 @@ endif
>>
>> # CFLAGS and LDFLAGS are for the users to override from the command line.
>>
>> @@ -10,7 +10,7 @@
>> LDFLAGS =
>> ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
>> ALL_LDFLAGS = $(LDFLAGS)
>> -@@ -289,12 +289,12 @@
>> +@@ -289,16 +289,17 @@ STRIP ?= strip
>> # runtime figures out where they are based on the path to the executable.
>> # This can help installing the suite in a relocatable way.
>>
>> @@ -26,7 +26,12 @@
>> sharedir = $(prefix)/share
>> gitwebdir = $(sharedir)/gitweb
>> template_dir = share/git-core/templates
>> -@@ -307,7 +307,7 @@
>> + htmldir = share/doc/git-doc
>> ++sysconfdir = ${SYSCONFDIR}
>> + ETC_GITCONFIG = $(sysconfdir)/gitconfig
>> + ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
>> + lib = lib
>> +@@ -307,7 +308,7 @@ pathsep = :
>>
>> export prefix bindir sharedir sysconfdir gitwebdir
>>
>> @@ -35,7 +40,7 @@
>> AR = ar
>> RM = rm -f
>> DIFF = diff
>> -@@ -315,10 +315,10 @@
>> +@@ -315,10 +316,10 @@ TAR = tar
>> FIND = find
>> INSTALL = install
>> RPMBUILD = rpmbuild
>> @@ -49,7 +54,7 @@
>> PTHREAD_CFLAGS =
>> GCOV = gcov
>>
>> -@@ -949,13 +949,14 @@
>> +@@ -949,13 +950,14 @@ ifeq ($(uname_S),FreeBSD)
>> HAVE_PATHS_H = YesPlease
>> endif
>> ifeq ($(uname_S),OpenBSD)
>> @@ -67,7 +72,7 @@
>> endif
>> ifeq ($(uname_S),NetBSD)
>> ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
>> -@@ -1314,7 +1315,7 @@
>> +@@ -1314,7 +1316,7 @@ endif
>> EXTLIBS += -lz
>>
>> ifndef NO_OPENSSL
>> @@ -76,7 +81,7 @@
>> ifdef OPENSSLDIR
>> BASIC_CFLAGS += -I$(OPENSSLDIR)/include
>> OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
>> $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
>> -@@ -2146,7 +2147,7 @@
>> +@@ -2146,7 +2148,7 @@ export NO_SVN_TESTS
>>
>> ### Testing rules
>>
>>
>> --
>> DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
>> This message will self-destruct in 3 seconds.
>>
>
> --
> Antoine
>
Maybe... I'm unsure why the release tarball ships with a Makefile... if there is
a reason...
Re: update: git; sets sysconfdir
On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> Antoine Jacoutot wrote:
>
> > You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
> >
> >
> > --
> > Antoine
> >
>
> I'm sure I was missing something...
>
> Reroll diff:
Can't the port just use CONFIGURE_STYLE=gnu so that
--sysconfdir=${SYSCONFDIR} is passed to configure?
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.80
> diff -u -r1.80 Makefile
> --- Makefile 30 Jul 2011 05:08:05 - 1.80
> +++ Makefile 29 Aug 2011 09:06:31 -
> @@ -11,7 +11,7 @@
> PKGNAME-x11 =git-x11-${V}
> CATEGORIES = devel
>
> -REVISION = 0
> +REVISION = 1
>
> HOMEPAGE = http://git-scm.com/
>
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
> retrieving revision 1.32
> diff -u -r1.32 patch-Makefile
> --- patches/patch-Makefile24 Jul 2011 16:29:30 - 1.32
> +++ patches/patch-Makefile29 Aug 2011 09:56:17 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
> Makefile.origMon Jun 27 00:26:13 2011
> -+++ Makefile Sat Jul 16 14:44:47 2011
> -@@ -271,7 +271,7 @@
> +--- Makefile.origSun Jun 26 17:26:13 2011
> Makefile Mon Aug 29 03:46:06 2011
> +@@ -271,7 +271,7 @@ endif
>
> # CFLAGS and LDFLAGS are for the users to override from the command line.
>
> @@ -10,7 +10,7 @@
> LDFLAGS =
> ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
> ALL_LDFLAGS = $(LDFLAGS)
> -@@ -289,12 +289,12 @@
> +@@ -289,16 +289,17 @@ STRIP ?= strip
> # runtime figures out where they are based on the path to the executable.
> # This can help installing the suite in a relocatable way.
>
> @@ -26,7 +26,12 @@
> sharedir = $(prefix)/share
> gitwebdir = $(sharedir)/gitweb
> template_dir = share/git-core/templates
> -@@ -307,7 +307,7 @@
> + htmldir = share/doc/git-doc
> ++sysconfdir = ${SYSCONFDIR}
> + ETC_GITCONFIG = $(sysconfdir)/gitconfig
> + ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
> + lib = lib
> +@@ -307,7 +308,7 @@ pathsep = :
>
> export prefix bindir sharedir sysconfdir gitwebdir
>
> @@ -35,7 +40,7 @@
> AR = ar
> RM = rm -f
> DIFF = diff
> -@@ -315,10 +315,10 @@
> +@@ -315,10 +316,10 @@ TAR = tar
> FIND = find
> INSTALL = install
> RPMBUILD = rpmbuild
> @@ -49,7 +54,7 @@
> PTHREAD_CFLAGS =
> GCOV = gcov
>
> -@@ -949,13 +949,14 @@
> +@@ -949,13 +950,14 @@ ifeq ($(uname_S),FreeBSD)
> HAVE_PATHS_H = YesPlease
> endif
> ifeq ($(uname_S),OpenBSD)
> @@ -67,7 +72,7 @@
> endif
> ifeq ($(uname_S),NetBSD)
> ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
> -@@ -1314,7 +1315,7 @@
> +@@ -1314,7 +1316,7 @@ endif
> EXTLIBS += -lz
>
> ifndef NO_OPENSSL
> @@ -76,7 +81,7 @@
> ifdef OPENSSLDIR
> BASIC_CFLAGS += -I$(OPENSSLDIR)/include
> OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
> $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
> -@@ -2146,7 +2147,7 @@
> +@@ -2146,7 +2148,7 @@ export NO_SVN_TESTS
>
> ### Testing rules
>
>
> --
> DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
> This message will self-destruct in 3 seconds.
>
--
Antoine
Re: update: git; sets sysconfdir
Antoine Jacoutot wrote:
> You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
>
>
> --
> Antoine
>
I'm sure I was missing something...
Reroll diff:
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- Makefile30 Jul 2011 05:08:05 - 1.80
+++ Makefile29 Aug 2011 09:06:31 -
@@ -11,7 +11,7 @@
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://git-scm.com/
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.32
diff -u -r1.32 patch-Makefile
--- patches/patch-Makefile 24 Jul 2011 16:29:30 - 1.32
+++ patches/patch-Makefile 29 Aug 2011 09:56:17 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
Makefile.orig Mon Jun 27 00:26:13 2011
-+++ Makefile Sat Jul 16 14:44:47 2011
-@@ -271,7 +271,7 @@
+--- Makefile.orig Sun Jun 26 17:26:13 2011
Makefile Mon Aug 29 03:46:06 2011
+@@ -271,7 +271,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -10,7 +10,7 @@
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
-@@ -289,12 +289,12 @@
+@@ -289,16 +289,17 @@ STRIP ?= strip
# runtime figures out where they are based on the path to the executable.
# This can help installing the suite in a relocatable way.
@@ -26,7 +26,12 @@
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
template_dir = share/git-core/templates
-@@ -307,7 +307,7 @@
+ htmldir = share/doc/git-doc
++sysconfdir = ${SYSCONFDIR}
+ ETC_GITCONFIG = $(sysconfdir)/gitconfig
+ ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
+ lib = lib
+@@ -307,7 +308,7 @@ pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir
@@ -35,7 +40,7 @@
AR = ar
RM = rm -f
DIFF = diff
-@@ -315,10 +315,10 @@
+@@ -315,10 +316,10 @@ TAR = tar
FIND = find
INSTALL = install
RPMBUILD = rpmbuild
@@ -49,7 +54,7 @@
PTHREAD_CFLAGS =
GCOV = gcov
-@@ -949,13 +949,14 @@
+@@ -949,13 +950,14 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
@@ -67,7 +72,7 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
-@@ -1314,7 +1315,7 @@
+@@ -1314,7 +1316,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
@@ -76,7 +81,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
$(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
-@@ -2146,7 +2147,7 @@
+@@ -2146,7 +2148,7 @@ export NO_SVN_TESTS
### Testing rules
--
DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
This message will self-destruct in 3 seconds.
Re: update: git; sets sysconfdir
On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> This patch sets sysconfdir to our default value (/etc/)
> instead of it's previous value (/usr/local/etc).
>
> This makes some utilities (like git config --system -l) work again,
> config files were read from /etc/ some versions ago...
You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.80
> diff -u -r1.80 Makefile
> --- Makefile 30 Jul 2011 05:08:05 - 1.80
> +++ Makefile 29 Aug 2011 09:06:31 -
> @@ -11,7 +11,7 @@
> PKGNAME-x11 =git-x11-${V}
> CATEGORIES = devel
>
> -REVISION = 0
> +REVISION = 1
>
> HOMEPAGE = http://git-scm.com/
>
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
> retrieving revision 1.32
> diff -u -r1.32 patch-Makefile
> --- patches/patch-Makefile24 Jul 2011 16:29:30 - 1.32
> +++ patches/patch-Makefile29 Aug 2011 09:24:48 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
> Makefile.origMon Jun 27 00:26:13 2011
> -+++ Makefile Sat Jul 16 14:44:47 2011
> -@@ -271,7 +271,7 @@
> +--- Makefile.origSun Jun 26 17:26:13 2011
> Makefile Mon Aug 29 03:46:06 2011
> +@@ -271,7 +271,7 @@ endif
>
> # CFLAGS and LDFLAGS are for the users to override from the command line.
>
> @@ -10,7 +10,7 @@
> LDFLAGS =
> ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
> ALL_LDFLAGS = $(LDFLAGS)
> -@@ -289,12 +289,12 @@
> +@@ -289,16 +289,17 @@ STRIP ?= strip
> # runtime figures out where they are based on the path to the executable.
> # This can help installing the suite in a relocatable way.
>
> @@ -26,7 +26,12 @@
> sharedir = $(prefix)/share
> gitwebdir = $(sharedir)/gitweb
> template_dir = share/git-core/templates
> -@@ -307,7 +307,7 @@
> + htmldir = share/doc/git-doc
> ++sysconfdir = /etc
> + ETC_GITCONFIG = $(sysconfdir)/gitconfig
> + ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
> + lib = lib
> +@@ -307,7 +308,7 @@ pathsep = :
>
> export prefix bindir sharedir sysconfdir gitwebdir
>
> @@ -35,7 +40,7 @@
> AR = ar
> RM = rm -f
> DIFF = diff
> -@@ -315,10 +315,10 @@
> +@@ -315,10 +316,10 @@ TAR = tar
> FIND = find
> INSTALL = install
> RPMBUILD = rpmbuild
> @@ -49,7 +54,7 @@
> PTHREAD_CFLAGS =
> GCOV = gcov
>
> -@@ -949,13 +949,14 @@
> +@@ -949,13 +950,14 @@ ifeq ($(uname_S),FreeBSD)
> HAVE_PATHS_H = YesPlease
> endif
> ifeq ($(uname_S),OpenBSD)
> @@ -67,7 +72,7 @@
> endif
> ifeq ($(uname_S),NetBSD)
> ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
> -@@ -1314,7 +1315,7 @@
> +@@ -1314,7 +1316,7 @@ endif
> EXTLIBS += -lz
>
> ifndef NO_OPENSSL
> @@ -76,7 +81,7 @@
> ifdef OPENSSLDIR
> BASIC_CFLAGS += -I$(OPENSSLDIR)/include
> OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
> $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
> -@@ -2146,7 +2147,7 @@
> +@@ -2146,7 +2148,7 @@ export NO_SVN_TESTS
>
> ### Testing rules
>
>
> --
> DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
> This message will self-destruct in 3 seconds.
>
>
--
Antoine
update: git; sets sysconfdir
This patch sets sysconfdir to our default value (/etc/)
instead of it's previous value (/usr/local/etc).
This makes some utilities (like git config --system -l) work again,
config files were read from /etc/ some versions ago...
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- Makefile30 Jul 2011 05:08:05 - 1.80
+++ Makefile29 Aug 2011 09:06:31 -
@@ -11,7 +11,7 @@
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://git-scm.com/
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.32
diff -u -r1.32 patch-Makefile
--- patches/patch-Makefile 24 Jul 2011 16:29:30 - 1.32
+++ patches/patch-Makefile 29 Aug 2011 09:24:48 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
Makefile.orig Mon Jun 27 00:26:13 2011
-+++ Makefile Sat Jul 16 14:44:47 2011
-@@ -271,7 +271,7 @@
+--- Makefile.orig Sun Jun 26 17:26:13 2011
Makefile Mon Aug 29 03:46:06 2011
+@@ -271,7 +271,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -10,7 +10,7 @@
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
-@@ -289,12 +289,12 @@
+@@ -289,16 +289,17 @@ STRIP ?= strip
# runtime figures out where they are based on the path to the executable.
# This can help installing the suite in a relocatable way.
@@ -26,7 +26,12 @@
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
template_dir = share/git-core/templates
-@@ -307,7 +307,7 @@
+ htmldir = share/doc/git-doc
++sysconfdir = /etc
+ ETC_GITCONFIG = $(sysconfdir)/gitconfig
+ ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
+ lib = lib
+@@ -307,7 +308,7 @@ pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir
@@ -35,7 +40,7 @@
AR = ar
RM = rm -f
DIFF = diff
-@@ -315,10 +315,10 @@
+@@ -315,10 +316,10 @@ TAR = tar
FIND = find
INSTALL = install
RPMBUILD = rpmbuild
@@ -49,7 +54,7 @@
PTHREAD_CFLAGS =
GCOV = gcov
-@@ -949,13 +949,14 @@
+@@ -949,13 +950,14 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
@@ -67,7 +72,7 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
-@@ -1314,7 +1315,7 @@
+@@ -1314,7 +1316,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
@@ -76,7 +81,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
$(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
-@@ -2146,7 +2147,7 @@
+@@ -2146,7 +2148,7 @@ export NO_SVN_TESTS
### Testing rules
--
DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
This message will self-destruct in 3 seconds.
Re: update: p5-Mojolicious-1.12 -> 1.92
On Sun, Aug 28, 2011 at 12:41 PM, Mikolaj Kucharski wrote: > On Fri, Aug 26, 2011 at 04:11:06PM -0500, Abel Abraham Camarillo Ojeda wrote: >> This surely breaks apps, it changes module names, adds functions, etc. >> >> Tested on amd64 with some custom apps, I cannot find ports that depend >> on this. >> >> regress ok. > > Did very limited testing with my simple web app and all seems to be > working fine with your update. > > Tested with Mojolicious::Plugin::Database which I've sent a minute ago. > > -- > best regards > q# > > Ok?
removal of mail/mail-notification
Hi. I'm planning to remove mail/mail-notification from the tree. It's been unmaintained for years and prevents other ports from being updated. Unless anyone strongly objects very soon, I'll move it to the attic. The other solution would be to take some patches from Fedora but they are huge because we would need support for gtk3, evolution3, gmime26... and I don't really want to deal with a maintainance nightmare. Any objection? -- Antoine
Re: [update] gpgme-1.3.1
On Mon, 29 Aug 2011 10:35:44 +0200 (CEST) Antoine Jacoutot wrote: > Hi. > > This diff updated gpgme to the latest release which I need for other > ports I'm working on. > > Comments/OK? Hi, ok for me. Cheers, Remi.
[update] gpgme-1.3.1
Hi.
This diff updated gpgme to the latest release which I need for other
ports I'm working on.
Comments/OK?
Index: Makefile
===
RCS file: /cvs/ports/security/gpgme/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile26 Nov 2010 07:51:00 - 1.24
+++ Makefile29 Aug 2011 08:33:59 -
@@ -2,31 +2,47 @@
COMMENT= GnuPG Made Easy
-DISTNAME= gpgme-1.1.5
-REVISION= 1
+DISTNAME= gpgme-1.3.1
CATEGORIES=security devel
-SHARED_LIBS= gpgme-pthread 17.0 \
- gpgme 17.0
+
+SHARED_LIBS += gpgme18.0 # 19.0
+SHARED_LIBS += gpgme-pthread18.0 # 19.0
HOMEPAGE= http://www.gnupg.org/gpgme.html
-# GPL
+# GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= pthread gpg-error
+
+WANTLIB += assuan gpg-error
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/
+EXTRACT_SUFX= .tar.bz2
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=--without-gpgsm
+CONFIGURE_ARGS=${CONFIGURE_SHARED} \
+ --with-gpg=${LOCALBASE}/bin/gpg \
+ --with-gpgsm=no \
+ --with-gpgconf=no \
+ --with-g13=no \
+ --without-pth \
+ --without-pth-test
MODULES= devel/gettext
RUN_DEPENDS= security/gnupg
BUILD_DEPENDS= ${RUN_DEPENDS}
-LIB_DEPENDS= security/libgpg-error>=1.4
+LIB_DEPENDS= security/libgpg-error>=1.4 \
+ security/libassuan
+
+# needed for the regression tests
+USE_GMAKE= Yes
USE_LIBTOOL= Yes
+
+pre-configure:
+ perl -pi -e 's,-lpthread,-pthread,g' \
+ ${WRKSRC}/{configure,src/Makefile.in,src/gpgme-config.in}
.include
Index: distinfo
===
RCS file: /cvs/ports/security/gpgme/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo16 Dec 2007 22:20:52 - 1.9
+++ distinfo29 Aug 2011 08:33:59 -
@@ -1,5 +1,5 @@
-MD5 (gpgme-1.1.5.tar.gz) = TObWwOQXCg37pMBRRl8rMQ==
-RMD160 (gpgme-1.1.5.tar.gz) = VFIOC8rOzDN+M7kubaxtHO2KMK8=
-SHA1 (gpgme-1.1.5.tar.gz) = Qo0PruR1Ceac6VYg1QdVeSlsuIQ=
-SHA256 (gpgme-1.1.5.tar.gz) = T/sZ1pt8+ReSUvp/Cl8NuQZEFwJNomB3DZWdz3vDSSo=
-SIZE (gpgme-1.1.5.tar.gz) = 929270
+MD5 (gpgme-1.3.1.tar.bz2) = kK+oQ2zismg8AByCS9ImAQ==
+RMD160 (gpgme-1.3.1.tar.bz2) = lTVAabUV75qoDpciZF6QixDqbco=
+SHA1 (gpgme-1.3.1.tar.bz2) = fRmpWiI52hN2Ta1/l1Qb6ITsWjc=
+SHA256 (gpgme-1.3.1.tar.bz2) = Fe8nqHWuDXnXRG/ZMd7aEUOOck/76sdESe0Zy6I99NQ=
+SIZE (gpgme-1.3.1.tar.bz2) = 841093
Index: patches/patch-gpgme_posix-io_c
===
RCS file: patches/patch-gpgme_posix-io_c
diff -N patches/patch-gpgme_posix-io_c
--- patches/patch-gpgme_posix-io_c 16 Dec 2007 22:20:52 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-gpgme_posix-io_c,v 1.1 2007/12/16 22:20:52 simon Exp $
gpgme/posix-io.c.orig Wed Aug 15 09:22:21 2007
-+++ gpgme/posix-io.c Wed Aug 15 09:25:05 2007
-@@ -33,6 +33,7 @@
- #include
- #include
- #include
-+#include
-
- #include "util.h"
- #include "priv-io.h"
--
Antoine
van Etten's WEEKLY CLIPPINGs - 29 Aug. UK: Outdoor Ads stumble - Digital Marches On
Circulation: 26,069 29/08/2011 Sent to:ports@openbsd.org [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] [IMAGE] Your AD here? contact me l...@talktalk.net [IMAGE] The Book Review [IMAGE] Publisher CLIPPINGs 57 Nutbourne Str London W10 4HW England Subscriptions & Comments to: email: l...@talktalk.net Published Daily and Weekly In Affiliation with: [IMAGE] [IMAGE]WEEKLY EDITION = Primary Sponsor [IMAGE] To ensure that you receive our special e-mail offers, please add...@talktalk.net to your address book. If you received this e-mail from a friend and would like to subscribe to our e-mail list, click here. To update your e-mail address, click here. The newsletter is paid for by advertisement and sent to Specials Subscribers on behalf of Leadresearch.co.uk. If you wish to unsubscribe to future e-mails from CLIPPINGs, please click here. Or send a request to: Clippings - 57 Nutbourne Str. London W10 4HW - England [IMAGE] [IMAGE] Most Popular Links - Last Week Atlona Introduces New Industrial Line 16x16 HDMI Matrix Switcher Outdoor Advertising Falters in the UKâBut Digital Continues to Grow Clear Channel gets social in UK bars Digital Signage Expo Announces 2012 Show [IMAGE] GENERAL NEWS Zappar Revolutionises In-Store Point of Sale With Augmented Reality App Sarner creates experience for Imperial War Museum Worldâs largest 3D digital cinema projection How to Steal Jewellery⦠in three minutes AirMedia Reports Loss Despite Increased Revenue Baguette-baking kiosk making news in France Clear Channel Airports To Add Digital Signage at Sacramento International Skype Acquires GroupMe UK: More than one in 10 city centre shops vacant, says BRC Kno Brings 3D and Videos to eTextbooks Industry Leaders To Take Center Stage at Mobile World Congress Survey Finds Back to School Shoppers Researching Purchases Using Smartphones and Tablets Virtual Boarding Agents Say âBonjourâ To Passengers EyeClick Installs EyePlay Aboard Viking Line Ships Canada: New Danone Public Participation Campaign Based on Facebook and Astral Affichageâs Digital Network Worldâs first sail-in cinema New AV for Port of Los Angeles Linked In Group for Digital Recognition Luxury Store Harrods Launches Media Division [Headlines] for once a retailer that has been awakened. "Depot" banks on PRESTIGEenterprise - Online Software AG's leading digital signage software has been used in all of the home accessories supplier's stores. Christie MicroTiles in Telemadridâs âEl CÃrculoâ BALDWIN WALLACE COLLEGE CHOOSES FAIR-PLAY BY TRANS-LUX DISPLAY The 12th Nuclear Power Information Centre is opened in Ulyanovsk The Nordic market for Digital Signage is forecast to reach over SEK 2 billion by 2015. Daktronics aims for sharper quality on Euro billboards BMO brings Monster display to Pearson Airport Screach makes digital signage at Wembley Stadium interactive Focus Media revenues soar; interactive rollout begins Digital Signage Federation Unveils Webinar Program Series Captivate Network Adds Chief Revenue Officer Placecast Extends ShopAlerts To Retailer's Apps Cisco and Shaw Theaters Transform the Retail Industry With Digital Signage Broome Community College Updates Its Image with Digital Signage September 11 PSAs to Run on Clear Channel's NYC Digital Signage MIT team researches a way to go beyond the screen [IMAGE] [IMAGE] [IMAGE] [IMAGE]
