Re: amule 2.2.3 port - ready for test
Hi, On Mon, Mar 2, 2009 at 9:14 PM, Torfinn Ingolfsen tin...@gmail.com wrote: And now ports/132264[1] has been submitted. References: 1) http://www.freebsd.org/cgi/query-pr.cgi?pr=132264 Maintainer feedback received - positive. Is anything more needed? If not, could somebody commit this? -- Regards, Torfinn Ingolfsen ___ 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.2.3 port - ready for test
Hello, On Sun, Mar 1, 2009 at 2:50 PM, Bernhard Fröhlich de...@bluelife.at wrote: On Thu, February 26, 2009 12:22 am, Torfinn Ingolfsen wrote: Hello, On Wed, Feb 25, 2009 at 2:08 PM, Bernhard Fröhlich de...@bluelife.at wrote: I've tried to build it in my tinderbox and it looks like the ftp/curl dependency is specified incorrect. Build log is attached. Aha, I hadn't updated the ports tree in my Tinderbox. Sorry about that. The attached version should work better. Builds fine for me :o) And now ports/132264[1] has been submitted. References: 1) http://www.freebsd.org/cgi/query-pr.cgi?pr=132264 -- Regards, Torfinn Ingolfsen ___ 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.2.3 port - ready for test
On Thu, February 26, 2009 12:22 am, Torfinn Ingolfsen wrote: Hello, On Wed, Feb 25, 2009 at 2:08 PM, Bernhard Fröhlich de...@bluelife.at wrote: I've tried to build it in my tinderbox and it looks like the ftp/curl dependency is specified incorrect. Build log is attached. Aha, I hadn't updated the ports tree in my Tinderbox. Sorry about that. The attached version should work better. Builds fine for me :o) -- Bernhard Fröhlich http://www.bluelife.at/ ___ 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.2.3 port - ready for test
Hello,
On Wed, Feb 25, 2009 at 2:08 PM, Bernhard Fröhlich de...@bluelife.at wrote:
I've tried to build it in my tinderbox and it looks like the ftp/curl
dependency is specified incorrect. Build log is attached.
Aha, I hadn't updated the ports tree in my Tinderbox. Sorry about that.
The attached version should work better.
--
Rgds,
Torfinn Ingolfsen
=== Generating patch
=== Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile /usr/ports/net-p2p/amule2/Makefile
--- /usr/ports/net-p2p/amule2.org/Makefile 2008-08-21 08:18:04.0 +0200
+++ /usr/ports/net-p2p/amule2/Makefile 2009-02-26 00:14:45.0 +0100
@@ -6,20 +6,19 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.3
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= bo...@tagnet.ru
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.5:${PORTSDIR}/ftp/curl
+
LATEST_LINK= aMule2
-CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
+CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
USE_BZIP2= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
@@ -45,6 +44,11 @@
AMULEDAEMON Compile aMule daemon version - EXPERIMENTAL off \
WXUNICODE Enable Unicode support on
+DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION}
+PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \
+ ED2K-Links.HOWTO INSTALL README TODO \
+ amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
+
.include bsd.port.pre.mk
.if !defined(WITHOUT_NLS)
@@ -119,13 +123,13 @@
post-install:
# fr manpages are still incomplete and can't be managed
# by MANLANG. Will be done when pages are complete.
+ ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
.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
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile.man /usr/ports/net-p2p/amule2/Makefile.man
--- /usr/ports/net-p2p/amule2.org/Makefile.man 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/Makefile.man 2009-01-18 12:58:51.0 +0100
@@ -1,25 +1,46 @@
# TODO : Add fr here when pages are complete
-MANLANG= de es hu
-MANCOMPRESSED= no
+MANLANG= de es eu hu
+#MANCOMPRESSED= no
.if defined(WITH_CAS)
-MAN1+= cas.1
-MAN1+= wxcas.1
+MAN1_EN+= cas.1
+MAN1_EN+= wxcas.1
+MAN1_DE+= cas.1
+MAN1_DE+= wxcas.1
+MAN1_ES+= cas.1
+MAN1_ES+= wxcas.1
+MAN1_EU+= cas.1
+MAN1_EU+= wxcas.1
+MAN1_HU+= cas.1
+MAN1_HU+= wxcas.1
.endif
.if defined(WITH_ALC)
-MAN1+= alc.1
+MAN1_EN+= alc.1
+MAN1_DE+= alc.1
+MAN1_ES+= alc.1
+MAN1_EU+= alc.1
+MAN1_HU+= alc.1
MAN1+= alcc.1
+MAN1_FR+= alcc.1
.endif
.if defined(WITH_AMULEWEBSRV)
MAN1+= amuleweb.1
+MAN1_FR+= amuleweb.1
.endif
.if defined(WITH_AMULECMD)
MAN1+= amulecmd.1
+MAN1_FR+= amulecmd.1
.endif
.if defined(WITH_ED2K)
MAN1+= ed2k.1
+MAN1_FR+= ed2k.1
.endif
.if defined(WITH_AMULEDAEMON)
MAN1+= amuled.1
+MAN1_EN+= amulegui.1
.endif
MAN1+= amule.1
-MAN1+= xas.1
+MAN1_EN+= xas.1
+MAN1_DE+= xas.1
+MAN1_ES+= xas.1
+MAN1_EU+= xas.1
+MAN1_HU+= xas.1
Files /usr/ports/net-p2p/amule2.org/aMule-2.2.3.tbz and /usr/ports/net-p2p/amule2/aMule-2.2.3.tbz differ
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/distinfo /usr/ports/net-p2p/amule2/distinfo
--- /usr/ports/net-p2p/amule2.org/distinfo 2007-01-12 18:18:48.0 +0100
+++ /usr/ports/net-p2p/amule2/distinfo 2008-12-29 20:43:48.0 +0100
@@ -1,6 +1,3 @@
-MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d
-SHA256 (aMule-2.1.3.tar.bz2) = 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-SIZE (aMule-2.1.3.tar.bz2) = 3248530
-MD5 (aMule-wx.patch?rev=1.2) = 7b61651b0abdee7dc577a03dad8025c1
-SHA256 (aMule-wx.patch?rev=1.2) = c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
-SIZE (aMule-wx.patch?rev=1.2) = 4943
+MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
+SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
+SIZE (aMule-2.2.3.tar.bz2) = 4666001
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp
--- /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.0 +0100
@@ -1,24 +0,0 @@
src/amuleDlg.cpp.orig Sun Jan 1 06:17:25 2006
-+++ src/amuleDlg.cpp Tue Jan 3 19:12:04 2006
-@@ -413,9 +413,9 @@
- {
- wxString msg = wxT( );
- #ifdef CLIENT_GUI
-- msg _(aMule remote control ) wxT(VERSION);
-+
Re: amule 2.2.3 port - ready for test
Hello,
On Sun, Jan 18, 2009 at 7:50 PM, Bernhard Fröhlich de...@bluelife.at wrote:
To be exact tinderbox complains about some directories that you have
removed but you shouldn't. So just remove these lines from pkg-plist and
tinderbox should be happy with it.
Attached is a new try. Good if someone else could test it before I send-pr it.
Have a nice day.
--
Regards,
Torfinn Ingolfsen
=== Generating patch
=== Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile /usr/ports/net-p2p/amule2/Makefile
--- /usr/ports/net-p2p/amule2.org/Makefile 2008-08-21 08:18:04.0 +0200
+++ /usr/ports/net-p2p/amule2/Makefile 2009-01-05 19:07:14.0 +0100
@@ -6,20 +6,19 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.3
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= bo...@tagnet.ru
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-*
+CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
USE_BZIP2= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
@@ -45,6 +44,11 @@
AMULEDAEMON Compile aMule daemon version - EXPERIMENTAL off \
WXUNICODE Enable Unicode support on
+DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION}
+PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \
+ ED2K-Links.HOWTO INSTALL README TODO \
+ amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
+
.include bsd.port.pre.mk
.if !defined(WITHOUT_NLS)
@@ -119,13 +123,13 @@
post-install:
# fr manpages are still incomplete and can't be managed
# by MANLANG. Will be done when pages are complete.
+ ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
.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
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile.man /usr/ports/net-p2p/amule2/Makefile.man
--- /usr/ports/net-p2p/amule2.org/Makefile.man 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/Makefile.man 2009-01-18 12:58:51.0 +0100
@@ -1,25 +1,46 @@
# TODO : Add fr here when pages are complete
-MANLANG= de es hu
-MANCOMPRESSED= no
+MANLANG= de es eu hu
+#MANCOMPRESSED= no
.if defined(WITH_CAS)
-MAN1+= cas.1
-MAN1+= wxcas.1
+MAN1_EN+= cas.1
+MAN1_EN+= wxcas.1
+MAN1_DE+= cas.1
+MAN1_DE+= wxcas.1
+MAN1_ES+= cas.1
+MAN1_ES+= wxcas.1
+MAN1_EU+= cas.1
+MAN1_EU+= wxcas.1
+MAN1_HU+= cas.1
+MAN1_HU+= wxcas.1
.endif
.if defined(WITH_ALC)
-MAN1+= alc.1
+MAN1_EN+= alc.1
+MAN1_DE+= alc.1
+MAN1_ES+= alc.1
+MAN1_EU+= alc.1
+MAN1_HU+= alc.1
MAN1+= alcc.1
+MAN1_FR+= alcc.1
.endif
.if defined(WITH_AMULEWEBSRV)
MAN1+= amuleweb.1
+MAN1_FR+= amuleweb.1
.endif
.if defined(WITH_AMULECMD)
MAN1+= amulecmd.1
+MAN1_FR+= amulecmd.1
.endif
.if defined(WITH_ED2K)
MAN1+= ed2k.1
+MAN1_FR+= ed2k.1
.endif
.if defined(WITH_AMULEDAEMON)
MAN1+= amuled.1
+MAN1_EN+= amulegui.1
.endif
MAN1+= amule.1
-MAN1+= xas.1
+MAN1_EN+= xas.1
+MAN1_DE+= xas.1
+MAN1_ES+= xas.1
+MAN1_EU+= xas.1
+MAN1_HU+= xas.1
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/distinfo /usr/ports/net-p2p/amule2/distinfo
--- /usr/ports/net-p2p/amule2.org/distinfo 2007-01-12 18:18:48.0 +0100
+++ /usr/ports/net-p2p/amule2/distinfo 2008-12-29 20:43:48.0 +0100
@@ -1,6 +1,3 @@
-MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d
-SHA256 (aMule-2.1.3.tar.bz2) = 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-SIZE (aMule-2.1.3.tar.bz2) = 3248530
-MD5 (aMule-wx.patch?rev=1.2) = 7b61651b0abdee7dc577a03dad8025c1
-SHA256 (aMule-wx.patch?rev=1.2) = c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
-SIZE (aMule-wx.patch?rev=1.2) = 4943
+MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
+SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
+SIZE (aMule-2.2.3.tar.bz2) = 4666001
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp
--- /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.0 +0100
@@ -1,24 +0,0 @@
src/amuleDlg.cpp.orig Sun Jan 1 06:17:25 2006
-+++ src/amuleDlg.cpp Tue Jan 3 19:12:04 2006
-@@ -413,9 +413,9 @@
- {
- wxString msg = wxT( );
- #ifdef CLIENT_GUI
-- msg _(aMule remote control ) wxT(VERSION);
-+ msg _(aMule remote control ) wxT(VERSION) wxT( for FreeBSD);
-
Re: amule 2.2.3 port - ready for test
Hello On Sun, Jan 18, 2009 at 7:50 PM, Bernhard Fröhlich de...@bluelife.at wrote: To be exact tinderbox complains about some directories that you have removed but you shouldn't. So just remove these lines from pkg-plist and tinderbox should be happy with it. I understand that, but I don't understand the difference between the handling of fr, pt_PT and the other locales.. Here is an example. the port install the following files: share/locale/da/LC_MESSAGES/amule.mo share/locale/pt_PT/LC_MESSAGES/amule.mo share/locale/fr/LC_MESSAGES/amule.mo (I verified this by doing tar tvf on the package archive) The last two are the ones tinderbox complains about, the first one (and all the others) doesn't get complaints from your tinderbox. Here is the corresponding lines in pkg-plist: share/locale/da/LC_MESSAGES/amule.mo share/locale/fr/LC_MESSAGES/amule.mo share/locale/pt_PT/LC_MESSAGES/amule.mo followed by these lines later in pkg-plist: @dirrmtry share/locale/da/LC_MESSAGES @dirrmtry share/locale/da @dirrmtry share/locale/fr_FR/LC_MESSAGES @dirrmtry share/locale/fr_FR @dirrmtry share/locale/pt_PT/LC_MESSAGES @dirrmtry share/locale/pt_PT There must be something wrong here, since tinderbox complains, but I just can't see the error / problem. portlint and port-tools are great tools for a quick check but a tinderbox can detect a lot more errors because it builds the ports in a clean environment so none of them can replace one another. Use them in combination and you catch most of the errors. Yes, I am still trying to get my tinderbox working again. -- Regards, Torfinn Ingolfsen ___ 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.2.3 port - ready for test
Hello, On Mon, Jan 12, 2009 at 9:46 AM, Bernhard Fröhlich de...@bluelife.at wrote: On Sat, January 10, 2009 5:28 pm, Torfinn Ingolfsen wrote: Hello, On Sat, Jan 10, 2009 at 4:20 PM, Bernhard Froehlich de...@bluelife.at wrote: I've applied your patch and compiled the port in an i386 Tinderbox for 6-STABLE and 7-STABLE. It compiles fine but leaves a few files behind and deletes a few directories which it shouldn't. Thanks for testing. A new patch will be sent to the mailing list. I really must get my own tinderbox running again soon. I've build your -5 patch and tinderbox keeps complaining about some missing directories. I'm still having problems getting my own tinderbox to run. Maybe I should just reinstall it (it was upgraded). amule - I wonder why 'port test' doesn't complain about missing files like your tinderbox does? -- Regards, Torfinn Ingolfsen ___ 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.2.3 port - ready for test
On Sun, January 18, 2009 1:05 pm, Torfinn Ingolfsen wrote: Hello, On Mon, Jan 12, 2009 at 9:46 AM, Bernhard Fröhlich de...@bluelife.at wrote: On Sat, January 10, 2009 5:28 pm, Torfinn Ingolfsen wrote: Hello, On Sat, Jan 10, 2009 at 4:20 PM, Bernhard Froehlich de...@bluelife.at wrote: I've applied your patch and compiled the port in an i386 Tinderbox for 6-STABLE and 7-STABLE. It compiles fine but leaves a few files behind and deletes a few directories which it shouldn't. Thanks for testing. A new patch will be sent to the mailing list. I really must get my own tinderbox running again soon. I've build your -5 patch and tinderbox keeps complaining about some missing directories. I'm still having problems getting my own tinderbox to run. Maybe I should just reinstall it (it was upgraded). amule - I wonder why 'port test' doesn't complain about missing files like your tinderbox does? To be exact tinderbox complains about some directories that you have removed but you shouldn't. So just remove these lines from pkg-plist and tinderbox should be happy with it. portlint and port-tools are great tools for a quick check but a tinderbox can detect a lot more errors because it builds the ports in a clean environment so none of them can replace one another. Use them in combination and you catch most of the errors. -- Bernhard Fröhlich http://www.bluelife.at/ ___ 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.2.3 port - ready for test
I got some feedback (in private mail), so I have updated my patch,
because the port was leaving traces behind.
I hope this is better.
See attachment.
--
Regards,
Torfinn Ingolfsen
=== Generating patch
=== Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile /usr/ports/net-p2p/amule2/Makefile
--- /usr/ports/net-p2p/amule2.org/Makefile 2008-08-21 08:18:04.0 +0200
+++ /usr/ports/net-p2p/amule2/Makefile 2009-01-05 19:07:14.0 +0100
@@ -6,20 +6,19 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.3
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= bo...@tagnet.ru
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-*
+CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
USE_BZIP2= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
@@ -45,6 +44,11 @@
AMULEDAEMON Compile aMule daemon version - EXPERIMENTAL off \
WXUNICODE Enable Unicode support on
+DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION}
+PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \
+ ED2K-Links.HOWTO INSTALL README TODO \
+ amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
+
.include bsd.port.pre.mk
.if !defined(WITHOUT_NLS)
@@ -119,13 +123,13 @@
post-install:
# fr manpages are still incomplete and can't be managed
# by MANLANG. Will be done when pages are complete.
+ ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
.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
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile.man /usr/ports/net-p2p/amule2/Makefile.man
--- /usr/ports/net-p2p/amule2.org/Makefile.man 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/Makefile.man 2009-01-10 03:02:20.0 +0100
@@ -1,12 +1,24 @@
# TODO : Add fr here when pages are complete
-MANLANG= de es hu
-MANCOMPRESSED= no
+MANLANG= de es eu hu
+#MANCOMPRESSED= no
.if defined(WITH_CAS)
-MAN1+= cas.1
-MAN1+= wxcas.1
+MAN1_EN+= cas.1
+MAN1_EN+= wxcas.1
+MAN1_DE+= cas.1
+MAN1_DE+= wxcas.1
+MAN1_ES+= cas.1
+MAN1_ES+= wxcas.1
+MAN1_EU+= cas.1
+MAN1_EU+= wxcas.1
+MAN1_HU+= cas.1
+MAN1_HU+= wxcas.1
.endif
.if defined(WITH_ALC)
-MAN1+= alc.1
+MAN1_EN+= alc.1
+MAN1_DE+= alc.1
+MAN1_ES+= alc.1
+MAN1_EU+= alc.1
+MAN1_HU+= alc.1
MAN1+= alcc.1
.endif
.if defined(WITH_AMULEWEBSRV)
@@ -20,6 +32,11 @@
.endif
.if defined(WITH_AMULEDAEMON)
MAN1+= amuled.1
+MAN1_EN+= amulegui.1
.endif
MAN1+= amule.1
-MAN1+= xas.1
+MAN1_EN+= xas.1
+MAN1_DE+= xas.1
+MAN1_ES+= xas.1
+MAN1_EU+= xas.1
+MAN1_HU+= xas.1
Files /usr/ports/net-p2p/amule2.org/aMule-2.2.3.tbz and /usr/ports/net-p2p/amule2/aMule-2.2.3.tbz differ
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/distinfo /usr/ports/net-p2p/amule2/distinfo
--- /usr/ports/net-p2p/amule2.org/distinfo 2007-01-12 18:18:48.0 +0100
+++ /usr/ports/net-p2p/amule2/distinfo 2008-12-29 20:43:48.0 +0100
@@ -1,6 +1,3 @@
-MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d
-SHA256 (aMule-2.1.3.tar.bz2) = 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-SIZE (aMule-2.1.3.tar.bz2) = 3248530
-MD5 (aMule-wx.patch?rev=1.2) = 7b61651b0abdee7dc577a03dad8025c1
-SHA256 (aMule-wx.patch?rev=1.2) = c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
-SIZE (aMule-wx.patch?rev=1.2) = 4943
+MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
+SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
+SIZE (aMule-2.2.3.tar.bz2) = 4666001
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp
--- /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.0 +0100
@@ -1,24 +0,0 @@
src/amuleDlg.cpp.orig Sun Jan 1 06:17:25 2006
-+++ src/amuleDlg.cpp Tue Jan 3 19:12:04 2006
-@@ -413,9 +413,9 @@
- {
- wxString msg = wxT( );
- #ifdef CLIENT_GUI
-- msg _(aMule remote control ) wxT(VERSION);
-+ msg _(aMule remote control ) wxT(VERSION) wxT( for FreeBSD);
- #else
-- msg wxT(aMule ) wxT(VERSION);
-+ msg wxT(aMule ) wxT(VERSION) wxT( for FreeBSD);
- #endif
- msg wxT( );
- #ifdef CVSDATE
-@@ -425,7 +425,8 @@
- 'All-Platform' p2p client based on eMule \n\n
- Website: http://www.amule.org \n
- Forum: http://forum.amule.org \n
--
amule 2.2.3 port - ready for test
Hi,
I have made an upgrade for the net-p2p/amule2 port, to version 2.2.3.
At this point, 'port test' completes without errors, and without any
extra files.
I have tested the port on FreeBSD / amd64 (7.1-stable, 7.0-stable and
6.4-stable) - it compiles and runs.
Attached is a patch for the port itself (ie it patches the files in
net-p2p/amule2) which brings the port from 2.1.3_7 to 2.2.3.
Could some of you test it before I send-pr the port update, please?
Feedback is welcome.
--
Regards,
Torfinn Ingolfsen
=== Generating patch
=== Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile /usr/ports/net-p2p/amule2/Makefile
--- /usr/ports/net-p2p/amule2.org/Makefile 2008-08-21 08:18:04.0 +0200
+++ /usr/ports/net-p2p/amule2/Makefile 2009-01-05 19:07:14.0 +0100
@@ -6,20 +6,19 @@
#
PORTNAME= aMule
-PORTVERSION= 2.1.3
-PORTREVISION= 7
+PORTVERSION= 2.2.3
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= bo...@tagnet.ru
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-*
+CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
USE_BZIP2= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
@@ -45,6 +44,11 @@
AMULEDAEMON Compile aMule daemon version - EXPERIMENTAL off \
WXUNICODE Enable Unicode support on
+DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION}
+PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \
+ ED2K-Links.HOWTO INSTALL README TODO \
+ amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
+
.include bsd.port.pre.mk
.if !defined(WITHOUT_NLS)
@@ -119,13 +123,13 @@
post-install:
# fr manpages are still incomplete and can't be managed
# by MANLANG. Will be done when pages are complete.
+ ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
.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
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/Makefile.man /usr/ports/net-p2p/amule2/Makefile.man
--- /usr/ports/net-p2p/amule2.org/Makefile.man 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/Makefile.man 2009-01-10 03:02:20.0 +0100
@@ -1,12 +1,24 @@
# TODO : Add fr here when pages are complete
-MANLANG= de es hu
-MANCOMPRESSED= no
+MANLANG= de es eu hu
+#MANCOMPRESSED= no
.if defined(WITH_CAS)
-MAN1+= cas.1
-MAN1+= wxcas.1
+MAN1_EN+= cas.1
+MAN1_EN+= wxcas.1
+MAN1_DE+= cas.1
+MAN1_DE+= wxcas.1
+MAN1_ES+= cas.1
+MAN1_ES+= wxcas.1
+MAN1_EU+= cas.1
+MAN1_EU+= wxcas.1
+MAN1_HU+= cas.1
+MAN1_HU+= wxcas.1
.endif
.if defined(WITH_ALC)
-MAN1+= alc.1
+MAN1_EN+= alc.1
+MAN1_DE+= alc.1
+MAN1_ES+= alc.1
+MAN1_EU+= alc.1
+MAN1_HU+= alc.1
MAN1+= alcc.1
.endif
.if defined(WITH_AMULEWEBSRV)
@@ -20,6 +32,11 @@
.endif
.if defined(WITH_AMULEDAEMON)
MAN1+= amuled.1
+MAN1_EN+= amulegui.1
.endif
MAN1+= amule.1
-MAN1+= xas.1
+MAN1_EN+= xas.1
+MAN1_DE+= xas.1
+MAN1_ES+= xas.1
+MAN1_EU+= xas.1
+MAN1_HU+= xas.1
Files /usr/ports/net-p2p/amule2.org/aMule-2.2.3.tbz and /usr/ports/net-p2p/amule2/aMule-2.2.3.tbz differ
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/distinfo /usr/ports/net-p2p/amule2/distinfo
--- /usr/ports/net-p2p/amule2.org/distinfo 2007-01-12 18:18:48.0 +0100
+++ /usr/ports/net-p2p/amule2/distinfo 2008-12-29 20:43:48.0 +0100
@@ -1,6 +1,3 @@
-MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d
-SHA256 (aMule-2.1.3.tar.bz2) = 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-SIZE (aMule-2.1.3.tar.bz2) = 3248530
-MD5 (aMule-wx.patch?rev=1.2) = 7b61651b0abdee7dc577a03dad8025c1
-SHA256 (aMule-wx.patch?rev=1.2) = c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
-SIZE (aMule-wx.patch?rev=1.2) = 4943
+MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
+SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
+SIZE (aMule-2.2.3.tar.bz2) = 4666001
diff -ruN --exclude=CVS /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp
--- /usr/ports/net-p2p/amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.0 +0100
+++ /usr/ports/net-p2p/amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.0 +0100
@@ -1,24 +0,0 @@
src/amuleDlg.cpp.orig Sun Jan 1 06:17:25 2006
-+++ src/amuleDlg.cpp Tue Jan 3 19:12:04 2006
-@@ -413,9 +413,9 @@
- {
- wxString msg = wxT( );
- #ifdef CLIENT_GUI
-- msg _(aMule remote control ) wxT(VERSION);
-+ msg _(aMule remote
