From a95c6ea5dea516f3b7a5d0ff8637b6576c8f02e3 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Thu, 20 Feb 2014 13:00:31 +0000 Subject: [PATCH] - Add stage support - Squeeze MASTER_SITES/MASTER_SITE_SUBDIR - Convert LIB_DEPENDS to new style - Use options helpers - Remove useless LATEST_LINK --- audio/taglib-extras/Makefile | 5 +- devel/automoc4/Makefile | 4 +- graphics/kcoloredit/Makefile | 4 +- graphics/kiconedit/Makefile | 6 +- graphics/kphotoalbum-kde4/Makefile | 34 ++---- graphics/kpovmodeler/Makefile | 4 +- graphics/kuickshow-kde4/Makefile | 6 +- math/eigen2/Makefile | 3 +- ports-mgmt/kpackagekit/Makefile | 3 +- sysutils/k3b-kde4/Makefile | 174 +++++++++-------------------- sysutils/kshutdown-kde4/Makefile | 3 - sysutils/policykit-qt/Makefile | 6 +- sysutils/polkit-qt/Makefile | 6 +- 13 files changed, 73 insertions(+), 185 deletions(-) diff --git a/audio/taglib-extras/Makefile b/audio/taglib-extras/Makefile index e410ec95a8bc..458fe482eb2d 100644 --- a/audio/taglib-extras/Makefile +++ b/audio/taglib-extras/Makefile @@ -12,12 +12,9 @@ COMMENT= Extra taglib features for Amarok 2.2 LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib USES= cmake -NO_STAGE= yes - -.include post-extract: ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt -.include +.include diff --git a/devel/automoc4/Makefile b/devel/automoc4/Makefile index f20bb83a19ba..88c05203ff71 100644 --- a/devel/automoc4/Makefile +++ b/devel/automoc4/Makefile @@ -5,8 +5,7 @@ PORTNAME= automoc4 PORTVERSION= 0.9.88 PORTREVISION= 3 CATEGORIES= devel kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -17,5 +16,4 @@ USE_BZIP2= yes USES= cmake iconv MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile index 25a8ca835f02..fb7e024d1a34 100644 --- a/graphics/kcoloredit/Makefile +++ b/graphics/kcoloredit/Makefile @@ -4,8 +4,7 @@ PORTNAME= kcoloredit PORTVERSION= ${APP_VER}.${EXTRA_VER} PORTREVISION= 3 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/extragear +MASTER_SITES= KDE/stable/extragear DISTNAME= ${PORTNAME}-${APP_VER}-kde${EXTRA_VER} DIST_SUBDIR= KDE/extragear @@ -20,5 +19,4 @@ USES= cmake APP_VER= 2.0.0 EXTRA_VER= 4.4.0 -NO_STAGE= yes .include diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile index b9a637d6293b..802d85a25edf 100644 --- a/graphics/kiconedit/Makefile +++ b/graphics/kiconedit/Makefile @@ -4,12 +4,11 @@ PORTNAME= kiconedit PORTVERSION= ${EXTRA_VER} PORTREVISION= 3 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/extragear +MASTER_SITES= KDE/stable/extragear DIST_SUBDIR= KDE/extragear MAINTAINER= kde@FreeBSD.org -COMMENT= A KDE icon editor +COMMENT= KDE icon editor USE_BZIP2= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 @@ -18,7 +17,6 @@ USES= cmake EXTRA_VER= 4.4.0 -NO_STAGE= yes post-patch: #Fix build with kdelibs>=4.5.0 ${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \ diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index 4859a4b64c1b..99daa54959f4 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -5,15 +5,14 @@ PORTNAME= kphotoalbum PORTVERSION= 4.4 PORTREVISION= 1 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Image viewer and organizer for KDE -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - exiv2:${PORTSDIR}/graphics/exiv2 +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libexiv2.so:${PORTSDIR}/graphics/exiv2 USE_KDE4= kdehier kdelibs kdeprefix libkdcraw libkipi automoc4 USE_QT4= phonon sql \ @@ -21,28 +20,15 @@ USE_QT4= phonon sql \ USE_BZIP2= yes USES= cmake:outsource -LATEST_LINK= ${PORTNAME}-kde4 - -OPTIONS_DEFINE= MARBLE -OPTIONS_DEFAULT=MARBLE +OPTIONS_DEFINE= MARBLE NLS +OPTIONS_DEFAULT= MARBLE +OPTIONS_SUB= yes # NLS MARBLE_DESC= Geolocation support +MARBLE_USE= KDE4=marble +MARBLE_CMAKE_OFF= -DWITH_Marble:BOOL=Off -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MMARBLE} -USE_KDE4+= marble -.else -CMAKE_ARGS+= -DWITH_Marble:BOOL=Off -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DBUILD_po:BOOL=Off -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CMAKE_OFF= -DBUILD_po:BOOL=Off .include diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile index bb647ff28412..7766aa317dfe 100644 --- a/graphics/kpovmodeler/Makefile +++ b/graphics/kpovmodeler/Makefile @@ -4,8 +4,7 @@ PORTNAME= kpovmodeler PORTVERSION= ${APP_VER}.${EXTRA_VER} PORTREVISION= 10 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= Attic/${EXTRA_VER}/src/extragear +MASTER_SITES= KDE/Attic/${EXTRA_VER}/src/extragear DISTNAME= ${PORTNAME}-${APP_VER}-kde${EXTRA_VER} DIST_SUBDIR= KDE/extragear @@ -23,7 +22,6 @@ USES= cmake gettext APP_VER= 1.1.3 EXTRA_VER= 4.3.1 -NO_STAGE= yes post-patch: #Fix build with kdelibs>=4.5.0 ${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \ diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile index 039772d40826..745082293a16 100644 --- a/graphics/kuickshow-kde4/Makefile +++ b/graphics/kuickshow-kde4/Makefile @@ -5,8 +5,7 @@ PORTNAME= kuickshow PORTVERSION= ${APP_VER}.${EXTRA_VER} PORTREVISION= 4 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/extragear +MASTER_SITES= KDE/stable/extragear DISTNAME= ${PORTNAME}-${APP_VER}-kde${EXTRA_VER} DIST_SUBDIR= KDE/extragear @@ -19,10 +18,7 @@ USE_KDE4= kdelibs kdeprefix kdehier automoc4 USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build USES= cmake gettext pkgconfig -LATEST_LINK= ${PORTNAME}-kde4 - APP_VER= 0.9.1 EXTRA_VER= 4.4.0 -NO_STAGE= yes .include diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile index 1305bf4278d0..40ae61988414 100644 --- a/math/eigen2/Makefile +++ b/math/eigen2/Makefile @@ -6,9 +6,9 @@ PORTVERSION= 2.0.17 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= https://bitbucket.org/eigen/eigen/get/ +PKGNAMESUFFIX= 2 DISTNAME= ${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -PKGNAMESUFFIX= 2 MAINTAINER= kde@FreeBSD.org COMMENT= Lightweight library for vector and matrix math @@ -18,7 +18,6 @@ USES= cmake WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-b23437e61a07 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|share/pkgconfig|libdata/pkgconfig|g' \ ${WRKSRC}/CMakeLists.txt diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile index eef3c2542f5b..bcedf94d100f 100644 --- a/ports-mgmt/kpackagekit/Makefile +++ b/ports-mgmt/kpackagekit/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE interface for PackageKit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= packagekit-qt.14:${PORTSDIR}/ports-mgmt/packagekit-qt4 +LIB_DEPENDS= libpackagekit-qt.so:${PORTSDIR}/ports-mgmt/packagekit-qt4 USE_BZIP2= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix @@ -24,5 +24,4 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION} -NO_STAGE= yes .include diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index 9a465b927ddc..25a68a32ef5a 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -10,19 +10,17 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE CD/DVD writing suite -LIB_DEPENDS= cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ - samplerate:${PORTSDIR}/audio/libsamplerate +LIB_DEPENDS= libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \ + libsamplerate.so:${PORTSDIR}/audio/libsamplerate RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools -LATEST_LINK= ${PORTNAME}-kde4 - USE_BZIP2= yes USES= cmake shared-mime-info CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \ -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF USE_KDE4= automoc4 kdeprefix kdelibs libkcddb -USE_QT4= gui dbus network phonon qt3support sql svg webkit xml \ +USE_QT4= gui phonon qt3support webkit \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes @@ -32,141 +30,69 @@ OPTIONS_DEFINE= CDRDAO DVDPLUSRW EMOVIX VCDIMAGER FFMPEG FLAC MAD \ OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD MUSEPACK SNDFILE \ VORBIS_DEC VORBIS_ENC LIBDVDREAD TAGLIB NO_OPTIONS_SORT=yes -CDRDAO_DESC= Burning: cdrdao -DVDPLUSRW_DESC= Burning: DVD+RW Tools (DVD+/-R(W)) -EMOVIX_DESC= Burning: eMovix (bootable video CDs) -VCDIMAGER_DESC= Burning: VCDImager (video CDs) -FFMPEG_DESC= Decoder: various (multimedia/ffmpeg) -FLAC_DESC= Decoder: FLAC (audio/flac) -MAD_DESC= Decoder: MP3 (audio/libmad) -MUSEPACK_DESC= Decoder: Musepack (audio/musepack) -SNDFILE_DESC= Decoder: various (audio/libsndfile) -VORBIS_DEC_DESC=Decoder: Ogg Vorbis -LAME_DESC= Encoder: MP3 (audio/lame) -SOX_DESC= Encoder: various (audio/sox) -VORBIS_ENC_DESC=Encoder: Ogg Vorbis -LIBDVDREAD_DESC=Misc: libdvdread (video DVD ripping) -NORMALIZE_DESC= Misc: normalize (adjust audio to a std. level) -TAGLIB_DESC= Misc: TagLib (reading/writing audio metadata) -TRANSCODE_DESC= Misc: Transcode (DVD ripping) +OPTIONS_SUB= yes # FFMPEG FLAC MAD MUSEPACK SNDFILE VORBIS_ENC VORBIS_DEC LIBDVDREAD TAGLIB -NO_STAGE= yes -.include +CDRDAO_DESC= Burning: cdrdao +CDRDAO_RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao -.if ${PORT_OPTIONS:MCDRDAO} -RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao -.endif +DVDPLUSRW_DESC= Burning: DVD+RW Tools (DVD+/-R(W)) +DVDPLUSRW_RUN_DEPENDS= dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools -.if ${PORT_OPTIONS:MDVDPLUSRW} -RUN_DEPENDS+= dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools -.endif +EMOVIX_DESC= Burning: eMovix (bootable video CDs) +EMOVIX_RUN_DEPENDS= mkmovixiso:${PORTSDIR}/multimedia/emovix -.if ${PORT_OPTIONS:MEMOVIX} -RUN_DEPENDS+= mkmovixiso:${PORTSDIR}/multimedia/emovix -.endif +VCDIMAGER_DESC= Burning: VCDImager (video CDs) +VCDIMAGER_RUN_DEPENDS= vcdxrip:${PORTSDIR}/multimedia/vcdimager -.if ${PORT_OPTIONS:MVCDIMAGER} -RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager -.endif +FFMPEG_DESC= Decoder: various (multimedia/ffmpeg) +FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +FFMPEG_CMAKE_OFF= -DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -PLIST_SUB+= FFMPEG="" -.else -CMAKE_ARGS+= -DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=OFF -PLIST_SUB+= FFMPEG="@comment " -.endif +FLAC_DESC= Decoder: FLAC (audio/flac) +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FLAC_CMAKE_OFF= -DK3B_BUILD_FLAC_DECODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac -PLIST_SUB+= FLAC="" -.else -CMAKE_ARGS+= -DK3B_BUILD_FLAC_DECODER_PLUGIN:BOOL=OFF -PLIST_SUB+= FLAC="@comment " -.endif +MAD_DESC= Decoder: MP3 (audio/libmad) +MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad +MAD_CMAKE_OFF= -DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MMAD} -LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad -PLIST_SUB+= MAD="" -.else -CMAKE_ARGS+= -DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF -PLIST_SUB+= MAD="@comment " -.endif +MUSEPACK_DESC= Decoder: Musepack (audio/musepack) +MUSEPACK_LIB_DEPENDS= libmpcdec.so:${PORTSDIR}/audio/musepack +MUSEPACK_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" +MUSEPACK_CMAKE_OFF= -DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MMUSEPACK} -CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" -LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/musepack -PLIST_SUB+= MUSEPACK="" -.else -CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF -PLIST_SUB+= MUSEPACK="@comment " -.endif +SNDFILE_DESC= Decoder: various (audio/libsndfile) +SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile +SNDFILE_CMAKE_ARGS= -DK3B_BUILD_SNDFILE_DECODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MSNDFILE} -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile -PLIST_SUB+= SNDFILE="" -.else -CMAKE_ARGS+= -DK3B_BUILD_SNDFILE_DECODER_PLUGIN:BOOL=OFF -PLIST_SUB+= SNDFILE="@comment " -.endif +VORBIS_DEC_DESC= Decoder: Ogg Vorbis +VORBIS_DEC_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg +VORBIS_DEC_CMAKE_OFF= -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MVORBIS_DEC} -LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg -PLIST_SUB+= VORBIS_DEC="" -.else -CMAKE_ARGS+= -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN:BOOL=OFF -PLIST_SUB+= VORBIS_DEC="@comment " -.endif +LAME_DESC= Encoder: MP3 (audio/lame) +LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame +LAME_CMAKE_OFF= -DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MLAME} -LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame -PLIST_SUB+= LAME="" -.else -CMAKE_ARGS+= -DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=OFF -PLIST_SUB+= LAME="@comment " -.endif +SOX_DESC= Encoder: various (audio/sox) +SOX_RUN_DEPENDS= sox:${PORTSDIR}/audio/sox +SOX_CMAKE_OFF= -DK3B_BUILD_SOX_ENCODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MSOX} -RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox -PLIST_SUB+= SOX="" -.else -CMAKE_ARGS+= -DK3B_BUILD_SOX_ENCODER_PLUGIN:BOOL=OFF -PLIST_SUB+= SOX="@comment " -.endif +VORBIS_ENC_DESC= Encoder: Ogg Vorbis +VORBIS_ENC_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg +VORBIS_ENC_CMAKE_OFF= -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN:BOOL=OFF -.if ${PORT_OPTIONS:MVORBIS_ENC} -LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg -PLIST_SUB+= VORBIS_ENC="" -.else -CMAKE_ARGS+= -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN:BOOL=OFF -PLIST_SUB+= VORBIS_ENC="@comment " -.endif +LIBDVDREAD_DESC= Misc: libdvdread (video DVD ripping) +LIBDVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread +LIBDVDREAD_CMAKE_OFF= -DK3B_ENABLE_DVD_RIPPING:BOOL=OFF -.if ${PORT_OPTIONS:MLIBDVDREAD} -LIB_DEPENDS+= dvdread:${PORTSDIR}/multimedia/libdvdread -PLIST_SUB+= LIBDVDREAD="" -.else -CMAKE_ARGS+= -DK3B_ENABLE_DVD_RIPPING:BOOL=OFF -PLIST_SUB+= LIBDVDREAD="@comment " -.endif +NORMALIZE_DESC= Misc: normalize (adjust audio to a std. level) +NORMALIZE_RUN_DEPENDS= normalize:${PORTSDIR}/audio/normalize -.if ${PORT_OPTIONS:MNORMALIZE} -RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize -.endif +TAGLIB_DESC= Misc: TagLib (reading/writing audio metadata) +TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib +TAGLIB_CMAKE_OFF= -DK3B_ENABLE_TAGLIB:BOOL=OFF -.if ${PORT_OPTIONS:MTAGLIB} -LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib -PLIST_SUB+= TAGLIB="" -.else -CMAKE_ARGS+= -DK3B_ENABLE_TAGLIB:BOOL=OFF -PLIST_SUB+= TAGLIB="@comment " -.endif - -.if ${PORT_OPTIONS:MTRANSCODE} -RUN_DEPENDS+= transcode:${PORTSDIR}/multimedia/transcode -.endif - -post-install: - @${CAT} ${PKGMESSAGE} +TRANSCODE_DESC= Misc: Transcode (DVD ripping) +TRANSCODE_RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode .include diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile index 3376c644923c..71a648a73a76 100644 --- a/sysutils/kshutdown-kde4/Makefile +++ b/sysutils/kshutdown-kde4/Makefile @@ -15,9 +15,6 @@ USES= cmake USE_QT4= moc_build qmake_build rcc_build uic_build USE_KDE4= automoc4 kdehier kdeprefix workspace -LATEST_LINK= ${PORTNAME}-kde4 - WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -NO_STAGE= yes .include diff --git a/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile index 39744c5c9f67..2fc1e5084583 100644 --- a/sysutils/policykit-qt/Makefile +++ b/sysutils/policykit-qt/Makefile @@ -5,14 +5,13 @@ PORTNAME= policykit-qt PORTVERSION= 0.9.4 PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/apps/KDE4.x/admin/ +MASTER_SITES= KDE/stable/apps/KDE4.x/admin/ DISTNAME= polkit-qt-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= PolicyKit manager for Qt -LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit +LIB_DEPENDS= libpolkit.so:${PORTSDIR}/sysutils/policykit USE_BZIP2= yes USE_LDCONFIG= yes @@ -23,7 +22,6 @@ USES= cmake gettext PORTSCOUT= limit:^0 -NO_STAGE= yes post-extract: ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile index fac0c5900c2e..1658f6eaa07a 100644 --- a/sysutils/polkit-qt/Makefile +++ b/sysutils/polkit-qt/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 0.103.0 PORTREVISION= 1 DISTVERSIONPREFIX= 1- CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/apps/KDE4.x/admin/ +MASTER_SITES= KDE/stable/apps/KDE4.x/admin/ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 frontend to PolKit-1 @@ -15,7 +14,7 @@ COMMENT= Qt 4 frontend to PolKit-1 LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= polkit-agent-1.0:${PORTSDIR}/sysutils/polkit +LIB_DEPENDS= libpolkit-agent-1.so:${PORTSDIR}/sysutils/polkit USE_BZIP2= yes USE_LDCONFIG= yes @@ -28,7 +27,6 @@ USES= cmake gettext # requiring us to explicitly set LDFLAGS. LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes post-extract: ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt