aboutsummaryrefslogtreecommitdiff
path: root/net-p2p/amule-devel
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2012-06-04 15:56:36 +0000
committerRene Ladan <rene@FreeBSD.org>2012-06-04 15:56:36 +0000
commit67448f0e1e20d908414c386f7e40160fa459133a (patch)
tree184c8099c8566733328da7846799dd4a1c5fe0a8 /net-p2p/amule-devel
parented8eab448b084ee12edb476b5e04e74514f6a75c (diff)
downloadports-67448f0e1e20d908414c386f7e40160fa459133a.tar.gz
ports-67448f0e1e20d908414c386f7e40160fa459133a.zip
Notes
Diffstat (limited to 'net-p2p/amule-devel')
-rw-r--r--net-p2p/amule-devel/Makefile83
-rw-r--r--net-p2p/amule-devel/distinfo4
-rw-r--r--net-p2p/amule-devel/files/patch-src-ObservableQueue.h20
3 files changed, 48 insertions, 59 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 1f92e9c5f609..629d7b13487c 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= amule
-PORTVERSION= 10771
-PORTREVISION= 2
+PORTVERSION= 10788
CATEGORIES= net-p2p
MASTER_SITES= http://amule.sourceforge.net/tarballs/
PKGNAMESUFFIX= -devel
@@ -42,23 +41,29 @@ CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
-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" on \
- CAS "Compile aMule Statistics for console" on \
- ED2K "Compile aMule ed2k links handler" on \
- FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" 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
+OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG ED2K FILEVIEW \
+ GEOIP MMAP MONOLITHIC OPTIMIZED_CFLAGS PLASMAMULE UPNP WEBSERVER WXCAS \
+ WXUNICODE XAS
+ALC_DESC= "Compile aMule Link Creator for GUI"
+ALCC_DESC= "Compile aMule Link Creator for console"
+AMULECMD_DESC= "Compile aMule command line client"
+AMULEDAEMON_DESC= "Compile aMule daemon version"
+AMULEGUI_DESC= "Compile aMule remote GUI"
+CAS_DESC= "Compile aMule Statistics for console"
+DEBUG_DESC= "Compile aMule with additional debugging output"
+ED2K_DESC= "Compile aMule ed2k links handler"
+FILEVIEW_DESC= "Compile file viewer for console (EXPERIMENTAL)"
+GEOIP_DESC= "Enable GeoIP IP2Country support"
+MMAP_DESC= "Enable using mapped memory"
+MONOLITHIC_DESC= "Compile monolithic aMule"
+PLASMAMULE_DESC= "Compile aMule plasma applet and engine"
+UPNP_DESC= "Enable Universal Plug and Play support"
+WEBSERVER_DESC= "Compile aMule WebServer"
+WXCAS_DESC= "Compile aMule Statistics for GUI"
+WXUNICODE_DESC= "Enable Unicode support"
+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
@@ -68,11 +73,11 @@ PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
.include <bsd.port.options.mk>
-.if !defined(WITH_DEBUG)
+.if empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ARGS+=--disable-debug
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.else
@@ -88,7 +93,7 @@ CONFIGURE_ARGS+= --disable-alc
PLIST_SUB+= ALC="@comment "
.endif
-.if !defined(WITHOUT_ALCC)
+.if ${PORT_OPTIONS:MALCC}
CONFIGURE_ARGS+= --enable-alcc
PLIST_SUB+= ALCC=""
.else
@@ -96,7 +101,7 @@ CONFIGURE_ARGS+= --disable-alcc
PLIST_SUB+= ALCC="@comment "
.endif
-.if !defined(WITHOUT_AMULECMD)
+.if ${PORT_OPTIONS:MAMULECMD}
CONFIGURE_ARGS+= --enable-amulecmd
PLIST_SUB+= AMULECMD=""
.else
@@ -104,7 +109,7 @@ CONFIGURE_ARGS+= --disable-amulecmd
PLIST_SUB+= AMULECMD="@comment "
.endif
-.if !defined(WITHOUT_AMULEDAEMON)
+.if ${PORT_OPTIONS:MAMULEDAEMON}
CONFIGURE_ARGS+= --enable-amule-daemon
PLIST_SUB+= AMULEDAEMON=""
USE_RC_SUBR= amuled.sh
@@ -113,7 +118,7 @@ CONFIGURE_ARGS+= --disable-amule-daemon
PLIST_SUB+= AMULEDAEMON="@comment "
.endif
-.if !defined(WITHOUT_AMULEGUI)
+.if ${PORT_OPTIONS:MAMULEGUI}
CONFIGURE_ARGS+= --enable-amule-gui
PLIST_SUB+= AMULEGUI=""
.else
@@ -121,7 +126,7 @@ CONFIGURE_ARGS+= --disable-amule-gui
PLIST_SUB+= AMULEGUI="@comment "
.endif
-.if !defined(WITHOUT_CAS)
+.if ${PORT_OPTIONS:MCAS}
CONFIGURE_ARGS+= --enable-cas
LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd
PLIST_SUB+= CAS=""
@@ -130,7 +135,7 @@ CONFIGURE_ARGS+= --disable-cas
PLIST_SUB+= CAS="@comment "
.endif
-.if !defined(WITHOUT_ED2K)
+.if ${PORT_OPTIONS:MED2K}
CONFLICTS+= ed2k-hash*
CONFIGURE_ARGS+= --enable-ed2k
PLIST_SUB+= ED2K=""
@@ -139,7 +144,7 @@ CONFIGURE_ARGS+= --disable-ed2k
PLIST_SUB+= ED2K="@comment "
.endif
-.if !defined(WITHOUT_FILEVIEW)
+.if ${PORT_OPTIONS:MFILEVIEW}
CONFIGURE_ARGS+= --enable-fileview
PLIST_SUB+= FILEVIEW=""
.else
@@ -147,20 +152,20 @@ CONFIGURE_ARGS+= --disable-fileview
PLIST_SUB+= FILEVIEW="@comment "
.endif
-.if !defined(WITHOUT_GEOIP)
+.if ${PORT_OPTIONS:MGEOIP}
CONFIGURE_ARGS+= --enable-geoip
LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP
.else
CONFIGURE_ARGS+= --disable-geoip
.endif
-.if !defined(WITHOUT_MMAP)
+.if ${PORT_OPTIONS:MMMAP}
CONFIGURE_ARGS+= --enable-mmap
.else
CONFIGURE_ARGS+= --disable-mmap
.endif
-.if !defined(WITHOUT_MONOLITHIC)
+.if ${PORT_OPTIONS:MMONOLITHIC}
CONFIGURE_ARGS+= --enable-monolithic
PLIST_SUB+= MONOLITHIC=""
.else
@@ -168,7 +173,11 @@ CONFIGURE_ARGS+= --disable-monolithic
PLIST_SUB+= MONOLITHIC="@comment "
.endif
-.if !defined(WITHOUT_PLASMAMULE)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+CONFIGURE_ARGS+= --enable-optimize
+.endif
+
+.if ${PORT_OPTIONS:MPLASMAMULE}
CONFIGURE_ENV+= ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
UPDATE_MIME_DATABASE=/usr/bin/true
@@ -182,13 +191,13 @@ CONFIGURE_ARGS+= --disable-plasmamule
PLIST_SUB+= PLASMAMULE="@comment "
.endif
-.if !defined(WITHOUT_UPNP)
+.if ${PORT_OPTIONS:MUPNP}
LIB_DEPENDS+= upnp.9:${PORTSDIR}/devel/upnp
.else
CONFIGURE_ARGS+= --disable-upnp
.endif
-.if !defined(WITHOUT_WEBSERVER)
+.if ${PORT_OPTIONS:MWEBSERVER}
CONFIGURE_ARGS+= --enable-webserver
PLIST_SUB+= WEBSERVER=""
.else
@@ -196,7 +205,7 @@ CONFIGURE_ARGS+= --disable-webserver
PLIST_SUB+= WEBSERVER="@comment "
.endif
-.if !defined(WITHOUT_WXCAS)
+.if ${PORT_OPTIONS:MWXCAS}
CONFIGURE_ARGS+= --enable-wxcas
PLIST_SUB+= WXCAS=""
.else
@@ -204,11 +213,11 @@ CONFIGURE_ARGS+= --disable-wxcas
PLIST_SUB+= WXCAS="@comment "
.endif
-.if !defined(WITHOUT_WXUNICODE)
+.if ${PORT_OPTIONS:MWXUNICODE}
WX_UNICODE= yes
.endif
-.if !defined(WITHOUT_XAS)
+.if ${PORT_OPTIONS:MXAS}
CONFIGURE_ARGS+= --enable-xas
PLIST_SUB+= XAS=""
.else
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index 44a5b7443d4b..070c8f933bf7 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aMule-SVN-r10771.tar.bz2) = bd8f120535362fa6bbd16edf684b8d36f357ab4b17214ce82a8fbbdd2353bf47
-SIZE (aMule-SVN-r10771.tar.bz2) = 4566024
+SHA256 (aMule-SVN-r10788.tar.bz2) = 0eb48fb0575f93d955d3686ee2b966455acfdda1ae1296e75e6739b5185e08d2
+SIZE (aMule-SVN-r10788.tar.bz2) = 4603252
diff --git a/net-p2p/amule-devel/files/patch-src-ObservableQueue.h b/net-p2p/amule-devel/files/patch-src-ObservableQueue.h
deleted file mode 100644
index 3b5c60260627..000000000000
--- a/net-p2p/amule-devel/files/patch-src-ObservableQueue.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ObservableQueue.h~
-+++ src/ObservableQueue.h
-@@ -331,7 +331,7 @@ CObservableQueue<ValueType>::~CObservabl
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
- {
-- NotifyObservers( EventType( EventType::STARTING ), o );
-+ this->NotifyObservers( EventType( EventType::STARTING ), o );
- }
-
-
-@@ -338,7 +338,7 @@ void CObservableQueue<ValueType>::Observ
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
- {
-- NotifyObservers( EventType( EventType::STOPPING ), o );
-+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
- }
-
- \ No newline at end of file