From owner-svn-ports-all@freebsd.org Mon Dec 31 13:08:54 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3405614338C4; Mon, 31 Dec 2018 13:08:54 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CFC076AC09; Mon, 31 Dec 2018 13:08:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1D1DAE2B; Mon, 31 Dec 2018 13:08:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBVD8rOr031528; Mon, 31 Dec 2018 13:08:53 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBVD8rOc031527; Mon, 31 Dec 2018 13:08:53 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201812311308.wBVD8rOc031527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 31 Dec 2018 13:08:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488779 - head/net-p2p/amule X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/net-p2p/amule X-SVN-Commit-Revision: 488779 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CFC076AC09 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2018 13:08:54 -0000 Author: rene Date: Mon Dec 31 13:08:53 2018 New Revision: 488779 URL: https://svnweb.freebsd.org/changeset/ports/488779 Log: net-p2p/amule: remove optional dependency on expired KDE4 Modified: head/net-p2p/amule/Makefile head/net-p2p/amule/pkg-plist Modified: head/net-p2p/amule/Makefile ============================================================================== --- head/net-p2p/amule/Makefile Mon Dec 31 13:07:29 2018 (r488778) +++ head/net-p2p/amule/Makefile Mon Dec 31 13:08:53 2018 (r488779) @@ -33,7 +33,7 @@ CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ - FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \ + FILEVIEW GEOIP MMAP MONOLITHIC NLS UPNP \ WEBSERVER WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console @@ -45,7 +45,6 @@ ED2K_DESC= Compile aMule ed2k links handler FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule -PLASMAMULE_DESC= Compile aMule plasma applet and engine WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ @@ -87,14 +86,6 @@ MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic -PLASMAMULE_CONFIGURE_ON= --enable-plasmamule -PLASMAMULE_USES= kde:4 qt:4 -PLASMAMULE_USE= KDE=kdelibs QT=dbus,gui,moc_build -PLASMAMULE_CONFIGURE_ENV= \ - ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ - KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ - UPDATE_MIME_DATABASE=/usr/bin/true - UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp @@ -107,11 +98,6 @@ XAS_USE= PERL5+=run .include -.if ${PORT_OPTIONS:MPLASMA_MULE} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2018-12-31 -.endif - .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif @@ -124,11 +110,6 @@ post-patch: post-patch-DOCS-off: @${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in - -post-patch-PLASMAMULE-on: - @${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ - -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ - ${WRKSRC}/src/utils/plasmamule/Makefile.in post-install-FILEVIEW-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin Modified: head/net-p2p/amule/pkg-plist ============================================================================== --- head/net-p2p/amule/pkg-plist Mon Dec 31 13:07:29 2018 (r488778) +++ head/net-p2p/amule/pkg-plist Mon Dec 31 13:08:53 2018 (r488779) @@ -1,15 +1,3 @@ -%%PLASMAMULE%%%%KDE_PREFIX%%/bin/plasmamule-engine-feeder -%%PLASMAMULE%%%%KDE_PREFIX%%/lib/kde4/plasma-applet-plasmamule.so -%%PLASMAMULE%%%%KDE_PREFIX%%/lib/kde4/plasma-engine-plasmamule.so -%%PLASMAMULE%%%%KDE_PREFIX%%/share/applications/plasmamule-engine-feeder.desktop -%%PLASMAMULE%%%%KDE_PREFIX%%/share/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg -%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/ed2k.protocol -%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/magnet.protocol -%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/plasma-applet-plasmamule.desktop -%%PLASMAMULE%%%%KDE_PREFIX%%/share/kde4/services/plasma-engine-plasmamule.desktop -%%PLASMAMULE%%%%KDE_PREFIX%%/share/mime/amule.xml -%%PLASMAMULE%%@postexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %%KDE_PREFIX%%/share/mime >/dev/null 2>&1 || true -%%PLASMAMULE%%@postunexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %%KDE_PREFIX%%/share/mime >/dev/null 2>&1 || true %%ALC%%bin/alc %%ALCC%%bin/alcc %%MONOLITHIC%%bin/amule