FreeBSD Bugzilla – Attachment 109918 Details for
Bug 150985
net-p2p/amule2: rename to net-p2p/amule and update to 10300
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
a.diff
a.diff (text/plain), 8.24 KB, created by
swell.k
on 2010-09-27 10:20:04 UTC
(
hide
)
Description:
a.diff
Filename:
MIME Type:
Creator:
swell.k
Created:
2010-09-27 10:20:04 UTC
Size:
8.24 KB
patch
obsolete
>Index: net-p2p/amule/Makefile >=================================================================== >RCS file: /a/.cvsup/ports/net-p2p/amule/Makefile,v >retrieving revision 1.41 >diff -u -p -r1.41 Makefile >--- net-p2p/amule/Makefile 7 Sep 2010 15:52:17 -0000 1.41 >+++ net-p2p/amule/Makefile 27 Sep 2010 08:34:01 -0000 >@@ -6,11 +6,10 @@ > # > > PORTNAME= amule >-PORTVERSION= 10275 >+PORTVERSION= 10300 > CATEGORIES= net-p2p >-MASTER_SITES= LOCAL/pav \ >- http://repo.or.cz/w/${PORTNAME}.git/snapshot/ >-DISTNAME= ${PORTNAME}-svn-r${PORTVERSION} >+MASTER_SITES= http://amule.sourceforge.net/tarballs/ >+DISTNAME= aMule-SVN-r${PORTVERSION} > > MAINTAINER= swell.k@gmail.com > COMMENT= The all-platform eMule p2p client >@@ -18,11 +17,9 @@ COMMENT= The all-platform eMule p2p clie > BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textproc/flex \ > ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp > >-LATEST_LINK= amule2 >-CONFLICTS= aMule-[0-9]* aMule-devel-[0-9]* ed2k-hash-[0-9]* >- >-WRKSRC= ${WRKDIR}/${PORTNAME} >+CONFLICTS= ed2k-hash-[0-9]* > >+USE_BZIP2= yes > USE_GNOME= pkgconfig > USE_GMAKE= yes > USE_KDE4= # empty >@@ -40,17 +37,20 @@ CPPFLAGS+= -I${LOCALBASE}/include > CFLAGS+= ${PTHREAD_CFLAGS} > LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib > >-OPTIONS= ALC "Compile aMule Link Creator (+GUI)" on \ >+OPTIONS= ALC "Compile aMule Link Creator for GUI" on \ >+ ALCC "Compile aMule Link Creator for console" on \ > AMULECMD "Compile aMule command line client" on \ > AMULEDAEMON "Compile aMule daemon version" on \ > AMULEGUI "Compile aMule remote GUI (EXPERIMENTAL)" on \ >- CAS "Compile C aMule Statistics (+GUI)" on \ >+ CAS "Compile aMule Statistics for console" on \ > ED2K "Compile aMule ed2k links handler" on \ > GEOIP "Enable GeoIP IP2Country support" off \ > MMAP "Enable using mapped memory" off \ >+ MONOLITHIC "Compile monolithic aMule" on \ > PLASMAMULE "Compile aMule plasma applet and engine" off \ > UPNP "Enable Universal Plug and Play support" off \ > WEBSERVER "Compile aMule WebServer" on \ >+ WXCAS "Compile aMule Statistics for GUI" on \ > WXUNICODE "Enable Unicode support" on \ > XAS "Install XChat2 plugin" on > >@@ -76,13 +76,21 @@ PLIST_SUB+= NLS="@comment " > .endif > > .if !defined(WITHOUT_ALC) >-CONFIGURE_ARGS+= --enable-alc --enable-alcc >+CONFIGURE_ARGS+= --enable-alc > PLIST_SUB+= ALC="" > .else >-CONFIGURE_ARGS+= --disable-alc --disable-alcc >+CONFIGURE_ARGS+= --disable-alc > PLIST_SUB+= ALC="@comment " > .endif > >+.if !defined(WITHOUT_ALCC) >+CONFIGURE_ARGS+= --enable-alcc >+PLIST_SUB+= ALCC="" >+.else >+CONFIGURE_ARGS+= --disable-alcc >+PLIST_SUB+= ALCC="@comment " >+.endif >+ > .if !defined(WITHOUT_AMULECMD) > CONFIGURE_ARGS+= --enable-amulecmd > PLIST_SUB+= AMULECMD="" >@@ -109,11 +117,11 @@ PLIST_SUB+= AMULEGUI="@comment " > .endif > > .if !defined(WITHOUT_CAS) >-CONFIGURE_ARGS+= --enable-cas --enable-wxcas >+CONFIGURE_ARGS+= --enable-cas > LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd > PLIST_SUB+= CAS="" > .else >-CONFIGURE_ARGS+= --disable-cas --disable-wxcas >+CONFIGURE_ARGS+= --disable-cas > PLIST_SUB+= CAS="@comment " > .endif > >@@ -138,6 +146,14 @@ CONFIGURE_ARGS+= --enable-mmap > CONFIGURE_ARGS+= --disable-mmap > .endif > >+.if !defined(WITHOUT_MONOLITHIC) >+CONFIGURE_ARGS+= --enable-monolithic >+PLIST_SUB+= MONOLITHIC="" >+.else >+CONFIGURE_ARGS+= --disable-monolithic >+PLIST_SUB+= MONOLITHIC="@comment " >+.endif >+ > .if !defined(WITHOUT_PLASMAMULE) > CONFIGURE_ENV+= ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config > CONFIGURE_ARGS+= --enable-plasmamule >@@ -163,6 +179,14 @@ CONFIGURE_ARGS+= --disable-webserver > PLIST_SUB+= WEBSERVER="@comment " > .endif > >+.if !defined(WITHOUT_WXCAS) >+CONFIGURE_ARGS+= --enable-wxcas >+PLIST_SUB+= WXCAS="" >+.else >+CONFIGURE_ARGS+= --disable-wxcas >+PLIST_SUB+= WXCAS="@comment " >+.endif >+ > .if !defined(WITHOUT_WXUNICODE) > WX_UNICODE= yes > .endif >@@ -183,7 +207,8 @@ post-patch: .SILENT > -e 's/test.*-print-file-name.*`/true/' \ > ${WRKSRC}/configure > .if defined(NOPORTDOCS) >- ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' ${WRKSRC}/docs/Makefile.in >+ ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ >+ ${WRKSRC}/docs/Makefile.in > .endif > .if !defined(WITHOUT_PLASMAMULE) > ${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \ >Index: net-p2p/amule/Makefile.man >=================================================================== >RCS file: /a/.cvsup/ports/net-p2p/amule/Makefile.man,v >retrieving revision 1.6 >diff -u -p -r1.6 Makefile.man >--- net-p2p/amule/Makefile.man 13 Aug 2010 13:18:23 -0000 1.6 >+++ net-p2p/amule/Makefile.man 23 Sep 2010 08:13:00 -0000 >@@ -3,15 +3,25 @@ MANLANG= "" de es eu fr hu it > #MANCOMPRESSED= no > > .if !defined(WITHOUT_NLS) >+. if !defined(WITHOUT_MONOLITHIC) > MAN1+= amule.1 >+. endif > . if !defined(WITHOUT_ALC) >-MAN1_EN+= alc.1 alcc.1 >-MAN1_DE+= alc.1 alcc.1 >-MAN1_ES+= alc.1 alcc.1 >-MAN1_EU+= alc.1 alcc.1 >+MAN1_EN+= alc.1 >+MAN1_DE+= alc.1 >+MAN1_ES+= alc.1 >+MAN1_EU+= alc.1 >+MAN1_HU+= alc.1 >+MAN1_IT+= alc.1 >+. endif >+. if !defined(WITHOUT_ALCC) >+MAN1_EN+= alcc.1 >+MAN1_DE+= alcc.1 >+MAN1_ES+= alcc.1 >+MAN1_EU+= alcc.1 > MAN1_FR+= alcc.1 >-MAN1_HU+= alc.1 alcc.1 >-MAN1_IT+= alc.1 alcc.1 >+MAN1_HU+= alcc.1 >+MAN1_IT+= alcc.1 > . endif > . if !defined(WITHOUT_AMULECMD) > MAN1+= amulecmd.1 >@@ -27,12 +37,12 @@ MAN1_HU+= amulegui.1 > MAN1_IT+= amulegui.1 > . endif > . if !defined(WITHOUT_CAS) >-MAN1_EN+= cas.1 wxcas.1 >-MAN1_DE+= cas.1 wxcas.1 >-MAN1_ES+= cas.1 wxcas.1 >-MAN1_EU+= cas.1 wxcas.1 >-MAN1_HU+= cas.1 wxcas.1 >-MAN1_IT+= cas.1 wxcas.1 >+MAN1_EN+= cas.1 >+MAN1_DE+= cas.1 >+MAN1_ES+= cas.1 >+MAN1_EU+= cas.1 >+MAN1_HU+= cas.1 >+MAN1_IT+= cas.1 > . endif > . if !defined(WITHOUT_ED2K) > MAN1+= ed2k.1 >@@ -40,6 +50,14 @@ MAN1+= ed2k.1 > . if !defined(WITHOUT_WEBSERVER) > MAN1+= amuleweb.1 > . endif >+. if !defined(WITHOUT_WXCAS) >+MAN1_EN+= wxcas.1 >+MAN1_DE+= wxcas.1 >+MAN1_ES+= wxcas.1 >+MAN1_EU+= wxcas.1 >+MAN1_HU+= wxcas.1 >+MAN1_IT+= wxcas.1 >+. endif > .endif # !WITHOUT_NLS > > .if !defined(WITHOUT_XAS) >Index: net-p2p/amule/distinfo >=================================================================== >RCS file: /a/.cvsup/ports/net-p2p/amule/distinfo,v >retrieving revision 1.15 >diff -u -p -r1.15 distinfo >--- net-p2p/amule/distinfo 3 Sep 2010 14:10:01 -0000 1.15 >+++ net-p2p/amule/distinfo 27 Sep 2010 07:34:41 -0000 >@@ -1,3 +1,3 @@ >-MD5 (amule-svn-r10275.tar.gz) = 892753e2ce41c0be0c47c2168fc2415d >-SHA256 (amule-svn-r10275.tar.gz) = 24807b9ce7cfdd311a96feb988a8580b93570746ba957035dba8112532f7119b >-SIZE (amule-svn-r10275.tar.gz) = 5950845 >+MD5 (aMule-SVN-r10300.tar.bz2) = c232f4711e8524502ad0b27c5b819f3e >+SHA256 (aMule-SVN-r10300.tar.bz2) = e6904ab2744e3c49db3dd105570157bf627f9d6ffe341bb22d2fe4759b5b561b >+SIZE (aMule-SVN-r10300.tar.bz2) = 4505424 >Index: net-p2p/amule/pkg-plist >=================================================================== >RCS file: /a/.cvsup/ports/net-p2p/amule/pkg-plist,v >retrieving revision 1.15 >diff -u -p -r1.15 pkg-plist >--- net-p2p/amule/pkg-plist 13 Aug 2010 13:18:23 -0000 1.15 >+++ net-p2p/amule/pkg-plist 23 Sep 2010 08:13:32 -0000 >@@ -15,8 +15,8 @@ > %%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true > %%PLASMAMULE%%@cwd > %%ALC%%bin/alc >-%%ALC%%bin/alcc >-bin/amule >+%%ALCC%%bin/alcc >+%%MONOLITHIC%%bin/amule > %%AMULECMD%%bin/amulecmd > %%AMULEDAEMON%%bin/amuled > %%AMULEGUI%%bin/amulegui >@@ -24,7 +24,7 @@ bin/amule > %%XAS%%bin/autostart-xas > %%CAS%%bin/cas > %%ED2K%%bin/ed2k >-%%CAS%%bin/wxcas >+%%WXCAS%%bin/wxcas > %%XAS%%lib/xchat/plugins/xas.pl > %%DATADIR%%/skins/Mac_Gray.zip > %%DATADIR%%/skins/gnome.zip >@@ -101,9 +101,9 @@ bin/amule > %%WEBSERVER%%%%DATADIR%%/webserver/default/up.png > %%WEBSERVER%%%%DATADIR%%/webserver/default/yellow.gif > %%ALC%%share/applications/alc.desktop >-share/applications/amule.desktop >+%%MONOLITHIC%%share/applications/amule.desktop > %%AMULEGUI%%share/applications/amulegui.desktop >-%%CAS%%share/applications/wxcas.desktop >+%%WXCAS%%share/applications/wxcas.desktop > %%CAS%%share/cas/stat.png > %%CAS%%share/cas/tmp.html > %%NLS%%share/locale/ar/LC_MESSAGES/amule.mo >@@ -144,9 +144,9 @@ share/applications/amule.desktop > %%NLS%%share/locale/zh_CN/LC_MESSAGES/amule.mo > %%NLS%%share/locale/zh_TW/LC_MESSAGES/amule.mo > %%ALC%%share/pixmaps/alc.xpm >-share/pixmaps/amule.xpm >+%%MONOLITHIC%%share/pixmaps/amule.xpm > %%AMULEGUI%%share/pixmaps/amulegui.xpm >-%%CAS%%share/pixmaps/wxcas.xpm >+%%WXCAS%%share/pixmaps/wxcas.xpm > %%XAS%%@dirrmtry lib/xchat/plugins > %%XAS%%@dirrmtry lib/xchat > @dirrmtry man/de/man1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 150985
: 109918