- reformat plist and makefiles: sort, remove `PL_' prefix, use DATADIR and uniform ifdefs (sweeping change) - switch to using so called "svn snapshots" from git - remove useless stuff: OPTIMIZE, gnomeprefix, gnomehier - replace gnomehack with one-line/one-file REINPLACE_CMD - split experimental amulegui from AMULEDAEMON - force using flex(1) and pkg-config(1) from LOCALBASE - run update-desktop-database(1) after installing .desktop files - add gdlib dependency for CAS - add PLASMAMULE, not sure if it works correctly Fix: includes diff from ports/148325
Maintainer of net-p2p/amule2, Please note that PR ports/149021 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/149021 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Only after wiping out all kde packages I noticed that my plist was inaccurate. Now, if only bsd.kde4.mk had KDE4_LOCALBASE... --- b.diff begins here --- diff --git a/Makefile b/Makefile index 65936a1..4e8224c 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.* WRKSRC= ${WRKDIR}/${PORTNAME:L} -USE_GNOME= desktopfileutils pkgconfig +USE_GNOME= pkgconfig USE_GMAKE= yes USE_KDE4= # empty USE_QT_VER= 4 @@ -206,7 +206,8 @@ post-patch: .SILENT post-install: .if !defined(WITHOUT_PLASMAMULE) - ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/plasmamule/*.so ${KDE4_PREFIX}/lib + @-update-mime-database ${KDE4_PREFIX}/share/mime + @-update-desktop-database ${KDE4_PREFIX}/share/applications .endif @-update-desktop-database ${PREFIX}/share/applications diff --git a/pkg-plist b/pkg-plist index 4929156..f682216 100644 --- a/pkg-plist +++ b/pkg-plist @@ -1,7 +1,18 @@ %%PLASMAMULE%%@cwd %%KDE4_PREFIX%% %%PLASMAMULE%%bin/plasmamule-engine-feeder -%%PLASMAMULE%%lib/plasma-applet-plasmamule.so -%%PLASMAMULE%%lib/plasma-engine-plasmamule.so +%%PLASMAMULE%%lib/kde4/plasma-applet-plasmamule.so +%%PLASMAMULE%%lib/kde4/plasma-engine-plasmamule.so +%%PLASMAMULE%%share/applications/plasmamule-engine-feeder.desktop +%%PLASMAMULE%%share/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg +%%PLASMAMULE%%share/kde4/services/ed2k.protocol +%%PLASMAMULE%%share/kde4/services/magnet.protocol +%%PLASMAMULE%%share/kde4/services/plasma-applet-plasmamule.desktop +%%PLASMAMULE%%share/kde4/services/plasma-engine-plasmamule.desktop +%%PLASMAMULE%%share/mime/amule.xml +%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true +%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true +%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true +%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true %%PLASMAMULE%%@cwd %%ALC%%bin/alc %%ALC%%bin/alcc --- b.diff ends here ---
- make ignored error more verbose but only during port installation - sort --- c.diff begins here --- diff --git a/Makefile b/Makefile index 4e8224c..646506e 100644 --- a/Makefile +++ b/Makefile @@ -206,9 +206,9 @@ post-patch: .SILENT post-install: .if !defined(WITHOUT_PLASMAMULE) - @-update-mime-database ${KDE4_PREFIX}/share/mime - @-update-desktop-database ${KDE4_PREFIX}/share/applications + -update-desktop-database ${KDE4_PREFIX}/share/applications + -update-mime-database ${KDE4_PREFIX}/share/mime .endif - @-update-desktop-database ${PREFIX}/share/applications + -update-desktop-database ${PREFIX}/share/applications .include <bsd.port.post.mk> diff --git a/pkg-plist b/pkg-plist index f682216..bb481de 100644 --- a/pkg-plist +++ b/pkg-plist @@ -9,10 +9,10 @@ %%PLASMAMULE%%share/kde4/services/plasma-applet-plasmamule.desktop %%PLASMAMULE%%share/kde4/services/plasma-engine-plasmamule.desktop %%PLASMAMULE%%share/mime/amule.xml -%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true -%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true %%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true %%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true +%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true +%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true %%PLASMAMULE%%@cwd %%ALC%%bin/alc %%ALC%%bin/alcc --- c.diff ends here ---
Hello! As I have no time to support aMule, I asked swell.k@gmail.com to take maintainership of this port. He agreed. So, please accept new port maintainer -- Regards, Boris
State Changed From-To: feedback->open Submitter will become the new maintainer. (Note to committer: please update MAINTAINER field.)
Class Changed From-To: change-request->maintainer-update
ftp://ftp.lissyara.su/users/Guest/amule.diff (cumulative) - update to r10261, use git tags[1] - swap maintainer address with mine Build tested with all OPTIONS enabled except for PLASMAMULE. [1] repo.or.cz mirror is still not usable without NO_CHECKSUM because it changes mtime inside archive every time. So, it's listed in MASTER_SITES mostly for maintainer convenience.
Building with gcc45 was fixed in r10263. The patch in ports/148325 is no longer needed. I've removed it in the cumulative diff and updated to r10266. However, unless this PR is committed ports/148325 is still valid on its own.
State Changed From-To: open->closed Committed, thanks!
pav 2010-08-13 13:18:24 UTC FreeBSD ports repository Modified files: net-p2p/amule2 Makefile Makefile.man distinfo pkg-plist Log: - Update to git r.10266 - Switch maintainers PR: ports/149021 Submitted by: Anonymous <swell.k@gmail.com> Approved by: Boris Kovalenko <boris@tagnet.ru> (old maintainer) Revision Changes Path 1.38 +122 -59 ports/net-p2p/amule2/Makefile 1.6 +40 -37 ports/net-p2p/amule2/Makefile.man 1.14 +3 -3 ports/net-p2p/amule2/distinfo 1.15 +177 -369 ports/net-p2p/amule2/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"