Re: amule 2 port - trying an upgrade
Hello,
Real life got in the way, and my amule2 porting efforts had to be put
on hold. Buttime waits for no man, and now aMule 2.2.3 has been
released. So I wil restart my efforts with the newest version.
On Sat, Aug 23, 2008 at 3:05 AM, Dmitry Marakasov amd...@amdmi3.ru wrote:
No, they are automake's macro language and are expanded my automake
to produce Makefile.in. Since the final product is Makefiles, shell
stuff is possible there.
However, you shouldn't modify .am stuff in this case, as automake
is not executed in the build process. The only things you're to
modify are configure and Makefile.in files.
You can, of course, modify .am stuff instead and call automake/autoconf
to regenerate stuff (via USE_AUTOTOOLS), but that's only needed in
extreme cases.
Thanks for explaining this.
PORTREVISION should be removed when PORTVERSION is bumped
Good to know.
+USE_XORG=x11
Not actually needed, as the port uses wx which assumes x11.
OK, I'll remove it then.
+USE_GETTEXT= yes
Using gettext conditionally like before no longer work?
I don't really know. What exactly do we gain by using gettext conditionally?
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Please remove, this is now handled automatically.
Ok, will do.
CONFIGURE_ARGS= --disable-debug \
+ --mandir=${MANPREFIX}/man \
Not needed, --mandir is appended to CONFIGURE_ARGS by default
I had noted that, but forhot tom remove that part.
-.if !defined(WITHOUT_OPTIMIZE)
+.if defined(WITH_OPTIMIZE)
No, checking WITHOUT_OPTIMIZE is correct. You should check
counter-default values for options, i.e. check WITH_FOO if FOO is
off by default, and WITHOUT_FOO if FOO is on by default. Same for
other checks.
Is this documented in the Porters Handbook anywhere? If so, I must
have missed it.
There are automatic ways to handle docs, so you don't need to change
plist on every update.
One way is to define DOCSDIR in the Makefile:
DOCSDIR=${PREFIX}/share/doc/aMule-${PORTVERSION}
and use %%DOCSDIR%% instead of share/doc/aMule-2.2.2 in the plist.
Another way is to add PORTDOCS=* to Makefile in addition to DOCSDIR,
and remove doc files from plist completely - they'll be added
automatically on install.
I will look into this.
Your comments are valuable - thank you.
--
Regards,
Torfinn Ingolfsen,
Norway
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
Re: amule 2 port - trying an upgrade
* Torfinn Ingolfsen (tin...@gmail.com) wrote: +USE_GETTEXT= yes Using gettext conditionally like before no longer work? I don't really know. What exactly do we gain by using gettext conditionally? Optional NLS support. Less depends, not installing unneeded locales if NLS is not needed. -.if !defined(WITHOUT_OPTIMIZE) +.if defined(WITH_OPTIMIZE) No, checking WITHOUT_OPTIMIZE is correct. You should check counter-default values for options, i.e. check WITH_FOO if FOO is off by default, and WITHOUT_FOO if FOO is on by default. Same for other checks. Is this documented in the Porters Handbook anywhere? Doesn't look like this. Maybe it should be. -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amd...@amdmi3.ru ..: jabber: amd...@jabber.ruhttp://www.amdmi3.ru ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
Re: amule 2 port - trying an upgrade
Hi Dmitry,
I am trying to install amule 2.2.1 with port system too.
but there is a intresting thing about the man page installation issue.
In my case, *_MANPAGES will be set by (from amule wiki)
./configure --with-wx-config=/usr/local/bin/wxgtk2u-2.8-config
--with-crypto-prefix=/usr/local/ --disable-debug
--with-curl-config=/usr/local/bin/curl-config --enable-webserver
--enable-optimize --with-included-gettext --enable-amule-daemon
--enable-amulecmd --enable-cas --enable-alcc
in ORIGINAL source tarbal(without replace bashims).
then man page can be installed by
cd docs/man
gmake install
so I think the original amule source tarbal is working.
Regards,
jyuny1
2008/8/23 Dmitry Marakasov [EMAIL PROTECTED]
* Torfinn Ingolfsen ([EMAIL PROTECTED]) wrote:
You should REINPLACE_CMD -e '/if test/ s|==|=|' ${WRKSRC}/configure
I have fixed that now (see attached diff). I also found a similar
thing in ${WRKSRC}/automake/manpages.am and tried to fix that.
Are automake files plain sh scripts? I guess they are.
No, they are automake's macro language and are expanded my automake
to produce Makefile.in. Since the final product is Makefiles, shell
stuff is possible there.
However, you shouldn't modify .am stuff in this case, as automake
is not executed in the build process. The only things you're to
modify are configure and Makefile.in files.
You can, of course, modify .am stuff instead and call automake/autoconf
to regenerate stuff (via USE_AUTOTOOLS), but that's only needed in
extreme cases.
Anyway, even with my new Makefile with your fixes, the install fails:
No time to look there now. I'll be available in couple of days if you
don't figure everything out by yourself by that time.
For now, however, some notes on the patch:
+PORTVERSION= 2.2.2
+PORTREVISION=1
PORTREVISION should be removed when PORTVERSION is bumped
+USE_XORG=x11
Not actually needed, as the port uses wx which assumes x11.
+USE_GETTEXT= yes
Using gettext conditionally like before no longer work?
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Please remove, this is now handled automatically.
CONFIGURE_ARGS= --disable-debug \
+ --mandir=${MANPREFIX}/man \
Not needed, --mandir is appended to CONFIGURE_ARGS by default
- --with-libintl-prefix=${LOCALBASE} \
- --with-libiconv-prefix=${LOCALBASE} \
- --enable-embedded_crypto
+ --with-wx-config=${WX_CONFIG} \
+ --with-gdlib-prefix=${LOCALBASE} \
+ --with-libpng-prefix=${LOCALBASE} \
+ --with-crypto-prefix=${LOCALBASE} \
+ --enable-monolithic
Judging from my experience, when CPPFLAGS/LDFLAGS with ${LOCALBASE}
paths are provided to configure (like in this case), --with-*-prefix
args are not needed, as configure detects stuff on its own.
-.if !defined(WITHOUT_OPTIMIZE)
+.if defined(WITH_OPTIMIZE)
No, checking WITHOUT_OPTIMIZE is correct. You should check
counter-default values for options, i.e. check WITH_FOO if FOO is
off by default, and WITHOUT_FOO if FOO is on by default. Same for
other checks.
-share/doc/aMule-2.1.3/ABOUT-NLS
-share/doc/aMule-2.1.3/amulesig.txt
-share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/doc/aMule-2.1.3/Changelog
-share/doc/aMule-2.1.3/Doxyfile
-share/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/doc/aMule-2.1.3/INSTALL
-share/doc/aMule-2.1.3/license.txt
-share/doc/aMule-2.1.3/README
-share/doc/aMule-2.1.3/TODO
-share/doc/aMule-2.1.3/EC_Protocol.txt
-share/doc/aMule-2.1.3/socks4.protocol
[EMAIL PROTECTED] share/doc/aMule-2.1.3
+share/doc/aMule-2.2.2/ABOUT-NLS
+share/doc/aMule-2.2.2/amulesig.txt
+share/doc/aMule-2.2.2/amule-win32.HOWTO.txt
+share/doc/aMule-2.2.2/Changelog
+share/doc/aMule-2.2.2/Doxyfile
+share/doc/aMule-2.2.2/ED2K-Links.HOWTO
+share/doc/aMule-2.2.2/INSTALL
+share/doc/aMule-2.2.2/license.txt
+share/doc/aMule-2.2.2/README
+share/doc/aMule-2.2.2/TODO
+share/doc/aMule-2.2.2/EC_Protocol.txt
+share/doc/aMule-2.2.2/socks4.protocol
[EMAIL PROTECTED] share/doc/aMule-2.2.2
There are automatic ways to handle docs, so you don't need to change
plist on every update.
One way is to define DOCSDIR in the Makefile:
DOCSDIR=${PREFIX}/share/doc/aMule-${PORTVERSION}
and use %%DOCSDIR%% instead of share/doc/aMule-2.2.2 in the plist.
Another way is to add PORTDOCS=* to Makefile in addition to DOCSDIR,
and remove doc files from plist completely - they'll be added
automatically on install.
-+msg _(aMule remote control ) wxT(VERSION) wxT( for
FreeBSD);
++ msg _(aMule remote control ) wxT(VERSION) wxT( for
FreeBSD);
#else
-msg wxT(aMule ) wxT(VERSION);
-+msg wxT(aMule ) wxT(VERSION) wxT( for FreeBSD);
++ msg wxT(aMule ) wxT(VERSION) wxT( for FreeBSD);
Please don't do no op
Re: amule 2 port - trying an upgrade
* Torfinn Ingolfsen ([EMAIL PROTECTED]) wrote: Port system does not install man pages for you. This should be done by the build scripts in the distribution tarball. You should probably look at various Makefiles* and/or configure script. Yes, I know. I have looked at the various Makefiles and the configure scripts. It looks like tha man pages should be installed, but for some reason they don't, and I don't understand why FYI, the port failed to patch with your diff: Strange it worked here. Maybe I messed up something. Anyway, I have made a new diff (attached). And this time I have testedc it on a fresh copy of the ports directory. It applies fine. In this version, I just try to get the english man pages insalled, to simplify my searc for bugs. Still the problen is the same: the ports own install system (Makefiles, autmake, whatever) doesn't want to install any other man paes than xas.1 and I don't understand why. Of course this means that the FreeBSD ports system can't find the man pages when it tries to gzip them. I'll check this out in couple of days. Usually what you do is send-pr the patch - this way it's easier to track who's responsible for procesing it. -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D [EMAIL PROTECTED] ..: jabber: [EMAIL PROTECTED]http://www.amdmi3.ru ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: amule 2 port - trying an upgrade
Hello, On Fri, Aug 22, 2008 at 2:58 PM, Dmitry Marakasov [EMAIL PROTECTED] wrote: I'll check this out in couple of days. Usually what you do is send-pr the patch - this way it's easier to track who's responsible for procesing it. I know about send-pr :) And I intend to snd-pr the patch, but I was hoping to get it in working shape first. That's why I am asking for help here. I have figured out another thing. according to the aMule wiki[1], aMule needs flex 2.5.35, and the port installs it as a build dependency. However, the old flex is still there: [EMAIL PROTECTED] which flex /usr/bin/flex [EMAIL PROTECTED] /usr/bin/flex --version /usr/bin/flex version 2.5.4 [EMAIL PROTECTED] /usr/local/bin/flex --version flex 2.5.35 and it looks like configure pick up the old flex: [EMAIL PROTECTED] grep flex work/a*/config.log configure:4647: checking for flex configure:4663: found /usr/bin/flex configure:4673: result: flex configure:4837: flex conftest.l configure:8884: checking for extended flex capabilities configure:8898: Your flex version doesn't support --header-file flag. This is not critical, but an upgrade is recommended ac_cv_prog_LEX=flex LEX='flex' How do I tell the prt to usethe flex in /usr/local/bin? Anyway, I'll test and see if this is the problem. Some time passes.. no, that didn't make a difference.I renamed /usr/bin/flex to flex.old and configure picks up the new flex, but man pages still won't install. :-( References: 1) http://www.amule.org/wiki/index.php/Install-amule-freebsd -- Regards, Torfinn ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: amule 2 port - trying an upgrade
* Torfinn Ingolfsen ([EMAIL PROTECTED]) wrote:
and it looks like configure pick up the old flex:
[EMAIL PROTECTED] grep flex work/a*/config.log
configure:4647: checking for flex
configure:4663: found /usr/bin/flex
configure:4673: result: flex
configure:4837: flex conftest.l
configure:8884: checking for extended flex capabilities
configure:8898: Your flex version doesn't support --header-file flag.
This is not critical, but an upgrade is recommended
ac_cv_prog_LEX=flex
LEX='flex'
How do I tell the prt to usethe flex in /usr/local/bin?
I think you should hack configure with REINPLACE_CMD and change
(configure:4643):
for ac_prog in flex lex
to
for ac_prog in ${LOCALBASE}/flex
something like that.
Anyway, I'll test and see if this is the problem.
Some time passes.. no, that didn't make a difference.I renamed
/usr/bin/flex to flex.old and configure picks up the new flex, but man
pages still won't install. :-(
You can see several
test: yes: unexpected operator
test: no: unexpected operator
test: yes: unexpected operator
test: yes: unexpected operator
thingies in the configure output.
Those are because FreeBSD test doesn't support ==, so
if test $AMULECMD == yes; then
fails and AMULECMD_MANPAGES is thus empty.
You should REINPLACE_CMD -e '/if test/ s|==|=|' ${WRKSRC}/configure (and
it's good to submit that fix upstream; bashisms should be eliminated).
--
Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D
[EMAIL PROTECTED] ..: jabber: [EMAIL PROTECTED]http://www.amdmi3.ru
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: amule 2 port - trying an upgrade
Hi,
On Sat, Aug 23, 2008 at 12:13 AM, Dmitry Marakasov [EMAIL PROTECTED] wrote:
I think you should hack configure with REINPLACE_CMD and change
(configure:4643):
for ac_prog in flex lex
to
for ac_prog in ${LOCALBASE}/flex
OK, if that is the best way, I'll do that.
Those are because FreeBSD test doesn't support ==, so
if test $AMULECMD == yes; then
fails and AMULECMD_MANPAGES is thus empty.
Aha. A bashism. Thanks!
You should REINPLACE_CMD -e '/if test/ s|==|=|' ${WRKSRC}/configure
I have fixed that now (see attached diff). I also found a similar
thing in ${WRKSRC}/automake/manpages.am and tried to fix that.
Are automake files plain sh scripts? I guess they are.
Anyway, even with my new Makefile with your fixes, the install fails:
Making install in docs
gmake[1]: Entering directory `/usr/ports/net-p2p/amule2/work/aMule-2.2.2/docs'
Making install in man
gmake[2]: Entering directory
`/usr/ports/net-p2p/amule2/work/aMule-2.2.2/docs/man'
gmake[3]: Entering directory
`/usr/ports/net-p2p/amule2/work/aMule-2.2.2/docs/man'
gmake[3]: Nothing to be done for `install-exec-am'.
gmake install-data-hook
gmake[4]: Entering directory
`/usr/ports/net-p2p/amule2/work/aMule-2.2.2/docs/man'
test: 1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/1/man1
install -o root -g wheel -m 444 ./amulecmd.1
/usr/local/man/1/man1/amulecmd.1.1
test: de.1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/de/man1
install -o root -g wheel -m 444 ./amulecmd.de.1
/usr/local/man/de/man1/amulecmd.1
test: es.1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/es/man1
install -o root -g wheel -m 444 ./amulecmd.es.1
/usr/local/man/es/man1/amulecmd.1
test: eu.1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/eu/man1
install -o root -g wheel -m 444 ./amulecmd.eu.1
/usr/local/man/eu/man1/amulecmd.1
test: fr.1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/fr/man1
install -o root -g wheel -m 444 ./amulecmd.fr.1
/usr/local/man/fr/man1/amulecmd.1
test: hu.1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/hu/man1
install -o root -g wheel -m 444 ./amulecmd.hu.1
/usr/local/man/hu/man1/amulecmd.1
test: 1: unexpected operator
/bin/sh ../../mkinstalldirs /usr/local/man/1/man1
I'll look harder at it tomorrow.
(and it's good to submit that fix upstream; bashisms should be eliminated).
I have started a thread in the amule forum, and asked about this
change. We'll see what the developers say.
--
Regards,
Torfinn Ingolfsen
--- amule2.org/Makefile 2008-06-09 00:20:03.0 +0200
+++ amule2/Makefile 2008-08-23 01:53:46.0 +0200
@@ -6,33 +6,39 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= SF/amule
-PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
-PATCHFILES= aMule-wx.patch?rev=1.2
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= [EMAIL PROTECTED]
COMMENT= The all-platform eMule p2p client
+BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+ ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
+
LATEST_LINK= aMule2
CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
USE_BZIP2= yes
+USE_XORG= x11
USE_GNOME= gnomehier gnomehack gnomeprefix
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_WX= 2.8
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-debug \
+ --mandir=${MANPREFIX}/man \
--without-included-gettext \
- --with-libintl-prefix=${LOCALBASE} \
- --with-libiconv-prefix=${LOCALBASE} \
- --enable-embedded_crypto
+ --with-wx-config=${WX_CONFIG} \
+ --with-gdlib-prefix=${LOCALBASE} \
+ --with-libpng-prefix=${LOCALBASE} \
+ --with-crypto-prefix=${LOCALBASE} \
+ --enable-monolithic
CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
LDFLAGS=${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -48,20 +54,14 @@
.include bsd.port.pre.mk
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-.else
-CONFIGURE_ARGS+= --disable-nls
-.endif
-
# Configure options
-.if !defined(WITHOUT_OPTIMIZE)
+.if defined(WITH_OPTIMIZE)
CONFIGURE_ARGS+= --enable-optimize
.else
CONFIGURE_ARGS+= --disable-optimize
.endif
-.if !defined(WITHOUT_ED2K)
+.if defined(WITH_ED2K)
CONFIGURE_ARGS+= --enable-ed2k
PLIST_SUB+= PL_ED2K=
.else
@@ -69,7 +69,7 @@
PLIST_SUB+= PL_ED2K=@comment
.endif
-.if !defined(WITHOUT_AMULECMD)
+.if defined(WITH_AMULECMD)
CONFIGURE_ARGS+= --enable-amulecmd
PLIST_SUB+= PL_AMULECMD=
.else
@@ -77,7 +77,7 @@
PLIST_SUB+= PL_AMULECMD=@comment
.endif
-.if !defined(WITHOUT_AMULEWEBSRV)
+.if defined(WITH_AMULEWEBSRV)
CONFIGURE_ARGS+= --enable-webserver
PLIST_SUB+= PL_AMULEWEBSRV=
.else
@@ -85,7 +85,7 @@
PLIST_SUB+= PL_AMULEWEBSRV=@comment
.endif
-.if
Re: amule 2 port - trying an upgrade
* Torfinn Ingolfsen ([EMAIL PROTECTED]) wrote:
You should REINPLACE_CMD -e '/if test/ s|==|=|' ${WRKSRC}/configure
I have fixed that now (see attached diff). I also found a similar
thing in ${WRKSRC}/automake/manpages.am and tried to fix that.
Are automake files plain sh scripts? I guess they are.
No, they are automake's macro language and are expanded my automake
to produce Makefile.in. Since the final product is Makefiles, shell
stuff is possible there.
However, you shouldn't modify .am stuff in this case, as automake
is not executed in the build process. The only things you're to
modify are configure and Makefile.in files.
You can, of course, modify .am stuff instead and call automake/autoconf
to regenerate stuff (via USE_AUTOTOOLS), but that's only needed in
extreme cases.
Anyway, even with my new Makefile with your fixes, the install fails:
No time to look there now. I'll be available in couple of days if you
don't figure everything out by yourself by that time.
For now, however, some notes on the patch:
+PORTVERSION= 2.2.2
+PORTREVISION=1
PORTREVISION should be removed when PORTVERSION is bumped
+USE_XORG=x11
Not actually needed, as the port uses wx which assumes x11.
+USE_GETTEXT= yes
Using gettext conditionally like before no longer work?
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Please remove, this is now handled automatically.
CONFIGURE_ARGS= --disable-debug \
+ --mandir=${MANPREFIX}/man \
Not needed, --mandir is appended to CONFIGURE_ARGS by default
- --with-libintl-prefix=${LOCALBASE} \
- --with-libiconv-prefix=${LOCALBASE} \
- --enable-embedded_crypto
+ --with-wx-config=${WX_CONFIG} \
+ --with-gdlib-prefix=${LOCALBASE} \
+ --with-libpng-prefix=${LOCALBASE} \
+ --with-crypto-prefix=${LOCALBASE} \
+ --enable-monolithic
Judging from my experience, when CPPFLAGS/LDFLAGS with ${LOCALBASE}
paths are provided to configure (like in this case), --with-*-prefix
args are not needed, as configure detects stuff on its own.
-.if !defined(WITHOUT_OPTIMIZE)
+.if defined(WITH_OPTIMIZE)
No, checking WITHOUT_OPTIMIZE is correct. You should check
counter-default values for options, i.e. check WITH_FOO if FOO is
off by default, and WITHOUT_FOO if FOO is on by default. Same for
other checks.
-share/doc/aMule-2.1.3/ABOUT-NLS
-share/doc/aMule-2.1.3/amulesig.txt
-share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/doc/aMule-2.1.3/Changelog
-share/doc/aMule-2.1.3/Doxyfile
-share/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/doc/aMule-2.1.3/INSTALL
-share/doc/aMule-2.1.3/license.txt
-share/doc/aMule-2.1.3/README
-share/doc/aMule-2.1.3/TODO
-share/doc/aMule-2.1.3/EC_Protocol.txt
-share/doc/aMule-2.1.3/socks4.protocol
[EMAIL PROTECTED] share/doc/aMule-2.1.3
+share/doc/aMule-2.2.2/ABOUT-NLS
+share/doc/aMule-2.2.2/amulesig.txt
+share/doc/aMule-2.2.2/amule-win32.HOWTO.txt
+share/doc/aMule-2.2.2/Changelog
+share/doc/aMule-2.2.2/Doxyfile
+share/doc/aMule-2.2.2/ED2K-Links.HOWTO
+share/doc/aMule-2.2.2/INSTALL
+share/doc/aMule-2.2.2/license.txt
+share/doc/aMule-2.2.2/README
+share/doc/aMule-2.2.2/TODO
+share/doc/aMule-2.2.2/EC_Protocol.txt
+share/doc/aMule-2.2.2/socks4.protocol
[EMAIL PROTECTED] share/doc/aMule-2.2.2
There are automatic ways to handle docs, so you don't need to change
plist on every update.
One way is to define DOCSDIR in the Makefile:
DOCSDIR=${PREFIX}/share/doc/aMule-${PORTVERSION}
and use %%DOCSDIR%% instead of share/doc/aMule-2.2.2 in the plist.
Another way is to add PORTDOCS=* to Makefile in addition to DOCSDIR,
and remove doc files from plist completely - they'll be added
automatically on install.
-+msg _(aMule remote control ) wxT(VERSION) wxT( for
FreeBSD);
++ msg _(aMule remote control ) wxT(VERSION) wxT( for
FreeBSD);
#else
-msg wxT(aMule ) wxT(VERSION);
-+msg wxT(aMule ) wxT(VERSION) wxT( for FreeBSD);
++ msg wxT(aMule ) wxT(VERSION) wxT( for FreeBSD);
Please don't do no op chenages
--
Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D
[EMAIL PROTECTED] ..: jabber: [EMAIL PROTECTED]http://www.amdmi3.ru
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: amule 2 port - trying an upgrade
On Mon, Aug 18, 2008 at 10:31:21PM +0200, Torfinn Ingolfsen wrote: As a first try, I have come up with the following diff[1]. The port compiles fine, but the installation step fails, because most of the man pages doesn't get installed. Here is the relevant part of the 'make install': === Compressing manual pages for aMule-2.2.2_1 gzip: can't stat: /usr/local/man/man1/cas.1: No such file or directory [snip] gzip: can't stat: /usr/local/man/hu/man1/amule.1: No such file or directory === Registering installation for aMule-2.2.2_1 Any hnts on how I fix this? I have read the man pages[2] chapter in the Porter's Handbook, but it didn't help me. AFAICT, the Makefile.man should work as is. Port system does not install man pages for you. This should be done by the build scripts in the distribution tarball. You should probably look at various Makefiles* and/or configure script. FYI, the port failed to patch with your diff: === Applying FreeBSD patches for aMule-2.2.2_1 1 out of 2 hunks failed--saving rejects to src/amuleDlg.cpp.rej = Patch patch-amuleDlg.cpp failed to apply cleanly. *** Error code 1 Alexey. ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: amule 2 port - trying an upgrade
Hello,
On Thu, Aug 21, 2008 at 12:55 PM, Alexey Shuvaev
[EMAIL PROTECTED] wrote:
Port system does not install man pages for you. This should be done
by the build scripts in the distribution tarball. You should probably look at
various Makefiles* and/or configure script.
Yes, I know. I have looked at the various Makefiles and the
configure scripts. It looks like tha man pages should be installed,
but for some reason they don't, and I don't understand why
FYI, the port failed to patch with your diff:
Strange it worked here. Maybe I messed up something.
Anyway, I have made a new diff (attached).
And this time I have testedc it on a fresh copy of the ports
directory. It applies fine.
In this version, I just try to get the english man pages insalled, to
simplify my searc for bugs. Still the problen is the same: the ports
own install system (Makefiles, autmake, whatever) doesn't want to
install any other man paes than xas.1 and I don't understand why.
Of course this means that the FreeBSD ports system can't find the man
pages when it tries to gzip them.
Any hints welcome.
--
Regards,
Torfinn Ingolfsen
--- amule2.org/Makefile 2008-06-09 00:20:03.0 +0200
+++ amule2/Makefile 2008-08-21 21:17:27.0 +0200
@@ -6,33 +6,39 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= SF/amule
-PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
-PATCHFILES= aMule-wx.patch?rev=1.2
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= [EMAIL PROTECTED]
COMMENT= The all-platform eMule p2p client
+BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+ ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
+
LATEST_LINK= aMule2
CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
USE_BZIP2= yes
+USE_XORG= x11
USE_GNOME= gnomehier gnomehack gnomeprefix
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_WX= 2.8
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-debug \
+ --mandir=${MANPREFIX}/man \
--without-included-gettext \
- --with-libintl-prefix=${LOCALBASE} \
- --with-libiconv-prefix=${LOCALBASE} \
- --enable-embedded_crypto
+ --with-wx-config=${WX_CONFIG} \
+ --with-gdlib-prefix=${LOCALBASE} \
+ --with-libpng-prefix=${LOCALBASE} \
+ --with-crypto-prefix=${LOCALBASE} \
+ --enable-monolithic
CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
LDFLAGS=${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -48,20 +54,14 @@
.include bsd.port.pre.mk
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-.else
-CONFIGURE_ARGS+= --disable-nls
-.endif
-
# Configure options
-.if !defined(WITHOUT_OPTIMIZE)
+.if defined(WITH_OPTIMIZE)
CONFIGURE_ARGS+= --enable-optimize
.else
CONFIGURE_ARGS+= --disable-optimize
.endif
-.if !defined(WITHOUT_ED2K)
+.if defined(WITH_ED2K)
CONFIGURE_ARGS+= --enable-ed2k
PLIST_SUB+= PL_ED2K=
.else
@@ -69,7 +69,7 @@
PLIST_SUB+= PL_ED2K=@comment
.endif
-.if !defined(WITHOUT_AMULECMD)
+.if defined(WITH_AMULECMD)
CONFIGURE_ARGS+= --enable-amulecmd
PLIST_SUB+= PL_AMULECMD=
.else
@@ -77,7 +77,7 @@
PLIST_SUB+= PL_AMULECMD=@comment
.endif
-.if !defined(WITHOUT_AMULEWEBSRV)
+.if defined(WITH_AMULEWEBSRV)
CONFIGURE_ARGS+= --enable-webserver
PLIST_SUB+= PL_AMULEWEBSRV=
.else
@@ -85,7 +85,7 @@
PLIST_SUB+= PL_AMULEWEBSRV=@comment
.endif
-.if !defined(WITHOUT_CAS)
+.if defined(WITH_CAS)
CONFIGURE_ARGS+= --enable-cas --enable-wxcas
PLIST_SUB+= PL_CAS=
.else
@@ -93,7 +93,7 @@
PLIST_SUB+= PL_CAS=@comment
.endif
-.if !defined(WITHOUT_ALC)
+.if defined(WITH_ALC)
CONFIGURE_ARGS+= --enable-alc --enable-alcc
PLIST_SUB+= PL_ALC=
.else
@@ -110,31 +110,11 @@
PLIST_SUB+= PL_AMULEDAEMON=@comment
.endif
-.if !defined(WITHOUT_WXUNICODE)
+.if defined(WITH_WXUNICODE)
WX_UNICODE=yes
.endif
# Man pages management
.include Makefile.man
-post-install:
-# fr manpages are still incomplete and can't be managed
-# by MANLANG. Will be done when pages are complete.
-.if defined(WITH_AMULECMD)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amulecmd.1
-.endif
-.if defined(WITH_AMULEWEBSRV)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuleweb.1
-.endif
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
-.if defined(WITH_AMULEDAEMON)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
-.endif
-.if defined(WITH_ED2K)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1
-.endif
-.if defined(WITH_ALC)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1
-.endif
-
.include bsd.port.post.mk
--- amule2.org/Makefile.man 2006-01-04 06:59:25.0 +0100
+++ amule2/Makefile.man 2008-08-21 22:04:53.0 +0200
@@ -1,12 +1,12 @@
# TODO : Add fr here when pages are complete
-MANLANG= de es hu
+MANLANG=
MANCOMPRESSED= no
.if defined(WITH_CAS)
-MAN1+= cas.1
-MAN1+= wxcas.1
+MAN1_EN+= cas.1
Re: amule 2 port - trying an upgrade
Hi, On Mon, Aug 18, 2008 at 10:31 PM, Torfinn Ingolfsen [EMAIL PROTECTED] wrote: Any hnts on how I fix this? I have read the man pages[2] chapter in the Porter's Handbook, but it didn't help me. AFAICT, the Makefile.man should work as is. Nobody who can suggest anything? -- Regards, Torfinn Ingolfsen ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to [EMAIL PROTECTED]
amule 2 port - trying an upgrade
Hello,
I am trying to upgrade the amule2 port from version 2.1.3 to version
2.2.2. I'm doing this because I use amule myself, and hve been
informed that the mainatiner curently is busy with other things in his
life. I'm not very experienced in the art of ports, in case anyone
should think that. :-)
As a first try, I have come up with the following diff[1]. The port
compiles fine, but the installation step fails, because most of the
man pages doesn't get installed. Here is the relevant part of the
'make install':
=== Compressing manual pages for aMule-2.2.2_1
gzip: can't stat: /usr/local/man/man1/cas.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/wxcas.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/alc.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/alcc.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/amuleweb.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/amulecmd.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/ed2k.1: No such file or directory
gzip: can't stat: /usr/local/man/man1/amule.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/cas.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/wxcas.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/alc.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/alcc.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/amuleweb.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/amulecmd.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/ed2k.1: No such file or directory
gzip: can't stat: /usr/local/man/de/man1/amule.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/cas.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/wxcas.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/alc.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/alcc.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/amuleweb.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/amulecmd.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/ed2k.1: No such file or directory
gzip: can't stat: /usr/local/man/es/man1/amule.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/cas.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/wxcas.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/alc.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/alcc.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/amuleweb.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/amulecmd.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/ed2k.1: No such file or directory
gzip: can't stat: /usr/local/man/hu/man1/amule.1: No such file or directory
=== Registering installation for aMule-2.2.2_1
Any hnts on how I fix this?
I have read the man pages[2] chapter in the Porter's Handbook, but it
didn't help me. AFAICT, the Makefile.man should work as is.
Note: I have read about the incomplete french (fr) man pages for amule
in the archives, but this is something else. I don't know how to fix
the french man pages either, but I'll take on one problem at a time.
:)
References:
1) amule2.diff -see attachment
2)
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-manpages.html
--
Regards,
Torfinn Ingolfsen
--- amule2.org/Makefile 2008-06-09 00:20:03.0 +0200
+++ amule2/Makefile 2008-08-18 21:44:22.0 +0200
@@ -6,15 +6,11 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= SF/amule
-PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
-PATCHFILES= aMule-wx.patch?rev=1.2
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= [EMAIL PROTECTED]
COMMENT= The all-platform eMule p2p client
@@ -48,6 +44,8 @@
.include bsd.port.pre.mk
+BUILD_DEPENDS= libcryptopp.a:${PORTSDIR}/security/cryptopp
+
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
.else
@@ -120,21 +118,21 @@
post-install:
# fr manpages are still incomplete and can't be managed
# by MANLANG. Will be done when pages are complete.
-.if defined(WITH_AMULECMD)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amulecmd.1
-.endif
-.if defined(WITH_AMULEWEBSRV)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuleweb.1
-.endif
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
-.if defined(WITH_AMULEDAEMON)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
-.endif
-.if defined(WITH_ED2K)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1
-.endif
-.if defined(WITH_ALC)
- ${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1
-.endif
+#.if defined(WITH_AMULECMD)
+# ${GZIP_CMD} ${PREFIX}/man/fr/man1/amulecmd.1
+#.endif
+#.if defined(WITH_AMULEWEBSRV)
+# ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuleweb.1
+#.endif
+# ${GZIP_CMD}
