summaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
authorBarbara Guida <bar@FreeBSD.org>2014-01-11 20:05:09 +0000
committerBarbara Guida <bar@FreeBSD.org>2014-01-11 20:05:09 +0000
commit1ff3d6e2209b1d7b406100afbfb50992891758c8 (patch)
treeea2b9b3a8c45a09fa287071afadb2c11322a32b2 /net-p2p
parentEnable stage support + minor cleanups (diff)
- Support STAGEDIR
- Fix build with clang on i386 - Update to SVN revision 10832 Approved by: flo (mentor)
Notes
Notes: svn path=/head/; revision=339449
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/amule-devel/Makefile25
-rw-r--r--net-p2p/amule-devel/Makefile.man38
-rw-r--r--net-p2p/amule-devel/distinfo4
-rw-r--r--net-p2p/amule-devel/pkg-plist168
4 files changed, 145 insertions, 90 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 399798ce25fc..cdbf491ce363 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= amule
-PORTVERSION= 10802
-PORTREVISION= 2
+PORTVERSION= 10832
CATEGORIES= net-p2p
MASTER_SITES= http://amule.sourceforge.net/tarballs/
PKGNAMESUFFIX= -devel
@@ -58,16 +57,16 @@ XAS_DESC= Install XChat2 plugin
OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \
FILEVIEW MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS
-PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt INSTALL README TODO \
- amulesig.txt license.txt
-
FLEX?= ${LOCALBASE}/bin/flex
SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
-NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" )
+CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM
+.endif
+
.if empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ARGS+=--disable-debug
.endif
@@ -220,9 +219,6 @@ CONFIGURE_ARGS+= --disable-xas
PLIST_SUB+= XAS="@comment "
.endif
-# Man pages management
-.include "Makefile.man"
-
post-patch: .SILENT
${REINPLACE_CMD} -e '/LDFLAGS/s/-lpthread/${PTHREAD_LIBS}/' \
-e 's/test.*-print-file-name.*`/true/' \
@@ -240,16 +236,7 @@ post-patch: .SILENT
post-install:
.if ${PORT_OPTIONS:MFILEVIEW}
- ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${PREFIX}/bin
-.endif
-.if exists(${LOCALBASE}/bin/update-desktop-database)
-. if ${PORT_OPTIONS:MPLASMAMULE}
- -update-desktop-database ${KDE4_PREFIX}/share/applications
-. if exists(${LOCALBASE}/bin/update-mime-database)
- -update-mime-database ${KDE4_PREFIX}/share/mime
-. endif
-. endif
- -update-desktop-database ${PREFIX}/share/applications
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin
.endif
.include <bsd.port.mk>
diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man
deleted file mode 100644
index 9b4136f97307..000000000000
--- a/net-p2p/amule-devel/Makefile.man
+++ /dev/null
@@ -1,38 +0,0 @@
-MANLANG= "" de es fr hu it ru tr zh_TW
-
-.if ${PORT_OPTIONS:MNLS}
-. if ${PORT_OPTIONS:MMONOLITHIC}
-MAN1+= amule.1
-. endif
-. if ${PORT_OPTIONS:MALC}
-MAN1+= alc.1
-. endif
-. if ${PORT_OPTIONS:MALCC}
-MAN1+= alcc.1
-. endif
-. if ${PORT_OPTIONS:MAMULECMD}
-MAN1+= amulecmd.1
-. endif
-. if ${PORT_OPTIONS:MAMULEDAEMON}
-MAN1+= amuled.1
-. endif
-. if ${PORT_OPTIONS:MAMULEGUI}
-MAN1+= amulegui.1
-. endif
-. if ${PORT_OPTIONS:MCAS}
-MAN1+= cas.1
-. endif
-. if ${PORT_OPTIONS:MED2K}
-MAN1+= ed2k.1
-. endif
-. if ${PORT_OPTIONS:MWEBSERVER}
-MAN1+= amuleweb.1
-. endif
-. if ${PORT_OPTIONS:MWXCAS}
-MAN1+= wxcas.1
-. endif
-.endif
-
-.if ${PORT_OPTIONS:MXAS}
-MAN1+= xas.1
-.endif
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index e4179b834f3c..811d71359ba7 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aMule-SVN-r10802.tar.bz2) = c097a61d09ad5a2e9a2a3e82d08ff0aedc1b937fa62902658601319ba50f535e
-SIZE (aMule-SVN-r10802.tar.bz2) = 4614274
+SHA256 (aMule-SVN-r10832.tar.bz2) = efabe9c0cb2f1105583de3bca29bba4f7ec451ff730e0469542b4dd30fbe8ca9
+SIZE (aMule-SVN-r10832.tar.bz2) = 4637562
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index bf2386736f7a..0271786acc94 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -9,8 +9,6 @@
%%PLASMAMULE%%share/kde4/services/plasma-applet-plasmamule.desktop
%%PLASMAMULE%%share/kde4/services/plasma-engine-plasmamule.desktop
%%PLASMAMULE%%share/mime/amule.xml
-%%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
-%%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
%%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
%%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
%%PLASMAMULE%%@cwd
@@ -27,6 +25,105 @@
%%FILEVIEW%%bin/mulefileview
%%WXCAS%%bin/wxcas
%%XAS%%lib/xchat/plugins/xas.pl
+%%NLS%%%%ALC%%man/de/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/de/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/de/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/de/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/de/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/de/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/de/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/de/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/de/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/de/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/de/man1/xas.1.gz
+%%NLS%%%%ALC%%man/es/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/es/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/es/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/es/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/es/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/es/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/es/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/es/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/es/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/es/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/es/man1/xas.1.gz
+%%NLS%%%%ALC%%man/fr/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/fr/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/fr/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/fr/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/fr/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/fr/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/fr/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/fr/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/fr/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/fr/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/fr/man1/xas.1.gz
+%%NLS%%%%ALC%%man/hu/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/hu/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/hu/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/hu/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/hu/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/hu/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/hu/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/hu/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/hu/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/hu/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/hu/man1/xas.1.gz
+%%NLS%%%%ALC%%man/it/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/it/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/it/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/it/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/it/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/it/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/it/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/it/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/it/man1/xas.1.gz
+%%ALC%%man/man1/alc.1.gz
+%%ALCC%%man/man1/alcc.1.gz
+%%MONOLITHIC%%man/man1/amule.1.gz
+%%AMULECMD%%man/man1/amulecmd.1.gz
+%%AMULEDAEMON%%man/man1/amuled.1.gz
+%%AMULEGUI%%man/man1/amulegui.1.gz
+%%WEBSERVER%%man/man1/amuleweb.1.gz
+%%CAS%%man/man1/cas.1.gz
+%%ED2K%%man/man1/ed2k.1.gz
+%%WXCAS%%man/man1/wxcas.1.gz
+%%XAS%%man/man1/xas.1.gz
+%%NLS%%%%ALC%%man/ru/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/ru/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/ru/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/ru/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/ru/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/ru/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/ru/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/ru/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/ru/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/ru/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/ru/man1/xas.1.gz
+%%NLS%%%%ALC%%man/tr/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/tr/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/tr/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/tr/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/tr/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/tr/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/tr/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/tr/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/tr/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/tr/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/tr/man1/xas.1.gz
+%%NLS%%%%ALC%%man/zh_TW/man1/alc.1.gz
+%%NLS%%%%ALCC%%man/zh_TW/man1/alcc.1.gz
+%%NLS%%%%MONOLITHIC%%man/zh_TW/man1/amule.1.gz
+%%NLS%%%%AMULECMD%%man/zh_TW/man1/amulecmd.1.gz
+%%NLS%%%%AMULEDAEMON%%man/zh_TW/man1/amuled.1.gz
+%%NLS%%%%AMULEGUI%%man/zh_TW/man1/amulegui.1.gz
+%%NLS%%%%WEBSERVER%%man/zh_TW/man1/amuleweb.1.gz
+%%NLS%%%%CAS%%man/zh_TW/man1/cas.1.gz
+%%NLS%%%%ED2K%%man/zh_TW/man1/ed2k.1.gz
+%%NLS%%%%WXCAS%%man/zh_TW/man1/wxcas.1.gz
+%%NLS%%%%XAS%%man/zh_TW/man1/xas.1.gz
%%DATADIR%%/skins/Mac_Gray.zip
%%DATADIR%%/skins/gnome.zip
%%DATADIR%%/skins/kde4.zip
@@ -107,6 +204,14 @@
%%WXCAS%%share/applications/wxcas.desktop
%%CAS%%share/cas/stat.png
%%CAS%%share/cas/tmp.html
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/EC_Protocol.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/amulesig.txt
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
%%NLS%%share/locale/ar/LC_MESSAGES/amule.mo
%%NLS%%share/locale/ast/LC_MESSAGES/amule.mo
%%NLS%%share/locale/bg/LC_MESSAGES/amule.mo
@@ -147,36 +252,37 @@
%%MONOLITHIC%%share/pixmaps/amule.xpm
%%AMULEGUI%%share/pixmaps/amulegui.xpm
%%WXCAS%%share/pixmaps/wxcas.xpm
-%%XAS%%@dirrmtry lib/xchat/plugins
-%%XAS%%@dirrmtry lib/xchat
-@dirrmtry man/de/man1
-@dirrmtry man/de
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/hu/man1
-@dirrmtry man/hu
-@dirrmtry man/it/man1
-@dirrmtry man/it
-@dirrmtry man/ru/man1
-@dirrmtry man/ru
-@dirrmtry man/tr/man1
-@dirrmtry man/tr
-@dirrmtry man/zh_TW/man1
-@dirrmtry man/zh_TW
-@dirrm %%DATADIR%%/skins
-%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
-%%WEBSERVER%%@dirrm %%DATADIR%%/webserver
-@dirrm %%DATADIR%%
-%%CAS%%@dirrmtry share/cas
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/et_EE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et_EE
-%%NLS%%@dirrmtry share/locale/it_CH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it_CH
%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ko_KR
+%%NLS%%@dirrmtry share/locale/it_CH/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it_CH
+%%NLS%%@dirrmtry share/locale/et_EE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et_EE
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%CAS%%@dirrmtry share/cas
+%%WEBSERVER%%@dirrmtry %%DATADIR%%/webserver/default
+%%WEBSERVER%%@dirrmtry %%DATADIR%%/webserver
+@dirrmtry %%DATADIR%%/skins
+@dirrmtry %%DATADIR%%
+@dirrmtry man/zh_TW/man1
+@dirrmtry man/zh_TW
+@dirrmtry man/tr/man1
+@dirrmtry man/tr
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
+@dirrmtry man/it/man1
+@dirrmtry man/it
+@dirrmtry man/hu/man1
+@dirrmtry man/hu
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry man/de/man1
+@dirrmtry man/de
+%%XAS%%@dirrmtry lib/xchat/plugins
+%%XAS%%@dirrmtry lib/xchat
@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true