diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-12-08 16:48:38 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-12-08 16:48:38 +0000 |
commit | 60945f027780c21c987e0c642404a8383407edad (patch) | |
tree | fd2d9471767ad6e92fff12ef08f1cb015017f9f8 /sysutils | |
parent | - Remove unnecessary BUILD_DEPENDS (diff) |
Replace USES=libtool:oldver with USES=libtool or USES=libtool:keepla in
the 32 ports that still use it. Bump PORTREVISION on their dependent
ports except the ones that depend on these:
audio/libogg
audio/libvorbis
devel/pcre
ftp/curl
graphics/jpeg
graphics/libart_lgpl
graphics/tiff
textproc/expat2
textproc/libxslt
In these cases the same trick as in the recent gettext update is used.
The ports install a symlink with the old library version. When enough
of their dependent ports have had regular updates the remaining ones can
get a PORTREVISION bump and the links can be removed.
Also remove the devel/pcre dependency from USE_GNOME=glib20. It causes
over 2200 packages to depend on devel/pcre while less than 200 actually
link with it. The glib20 package still depends on devel/pcre so this
should not make a difference for ports with USE_GNOME=glib20. Also,
libdata/pkgconfig/glib-2.0.pc lists pcre as a private library so
USE_GNOME=glib20 should not propagate it.
PR: 195724
Exp-run by: antoine
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=374303
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/ascpu/Makefile | 2 | ||||
-rw-r--r-- | sysutils/asusoled/Makefile | 2 | ||||
-rw-r--r-- | sysutils/bacula-client-static/Makefile | 1 | ||||
-rw-r--r-- | sysutils/bacula-client/Makefile | 1 | ||||
-rw-r--r-- | sysutils/bacula-server/Makefile | 15 | ||||
-rw-r--r-- | sysutils/bacula-server/pkg-plist | 3 | ||||
-rw-r--r-- | sysutils/bacula-server/pkg-plist.client | 3 | ||||
-rw-r--r-- | sysutils/cdrdao/Makefile | 2 | ||||
-rw-r--r-- | sysutils/dvdbackup/Makefile | 2 | ||||
-rw-r--r-- | sysutils/fusefs-mp3fs/Makefile | 1 | ||||
-rw-r--r-- | sysutils/gcdmaster/Makefile | 2 | ||||
-rw-r--r-- | sysutils/graveman/Makefile | 2 | ||||
-rw-r--r-- | sysutils/k3b-kde4/Makefile | 2 | ||||
-rw-r--r-- | sysutils/libcdio/Makefile | 1 | ||||
-rw-r--r-- | sysutils/logstalgia/Makefile | 2 | ||||
-rw-r--r-- | sysutils/mtpfs/Makefile | 2 | ||||
-rw-r--r-- | sysutils/tracker/Makefile | 1 | ||||
-rw-r--r-- | sysutils/vobcopy/Makefile | 2 | ||||
-rw-r--r-- | sysutils/xfburn/Makefile | 1 | ||||
-rw-r--r-- | sysutils/xfce4-settings/Makefile | 2 |
20 files changed, 27 insertions, 22 deletions
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile index 23b3b3c97ce4..885b71e159db 100644 --- a/sysutils/ascpu/Makefile +++ b/sysutils/ascpu/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.tigr.net/afterstep/download/ascpu/ MAINTAINER= demon@FreeBSD.org COMMENT= CPU statistics monitor utility for XFree86 -LIB_DEPENDS= libjpeg.so.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg USE_XORG= xpm GNU_CONFIGURE= yes diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile index a5ab891c4fd2..1ac779fe7f4f 100644 --- a/sysutils/asusoled/Makefile +++ b/sysutils/asusoled/Makefile @@ -2,7 +2,7 @@ PORTNAME= asusoled PORTVERSION= 0.10 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jkim diff --git a/sysutils/bacula-client-static/Makefile b/sysutils/bacula-client-static/Makefile index 71a6c5072a63..b0a937561b19 100644 --- a/sysutils/bacula-client-static/Makefile +++ b/sysutils/bacula-client-static/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= bacula +PORTREVISION= 1 PKGNAMESUFFIX= -client-static COMMENT= Network backup solution (static client) diff --git a/sysutils/bacula-client/Makefile b/sysutils/bacula-client/Makefile index 10c693c1ff0e..11f34c010e91 100644 --- a/sysutils/bacula-client/Makefile +++ b/sysutils/bacula-client/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= bacula +PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Network backup solution (client) diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index 3f2bd099d621..991e5b7777af 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -3,6 +3,7 @@ PORTNAME= bacula DISTVERSION= 7.0.5 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -11,7 +12,7 @@ PKGNAMESUFFIX?= -server MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) -USES+= libtool:oldver +USES+= libtool CONFLICTS?= bacula5-server-* @@ -142,7 +143,7 @@ MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: # This port does not install docs. See bacula-docs for that - ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in # Change $(ECHO) to echo in some Makefile.in files @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' \ ${WRKSRC}/src/filed/Makefile.in \ @@ -159,13 +160,17 @@ post-patch: # In client port only install startup script out of script dir (see below post-install) # Dont mkdir ${PREFIX}/share/bacula cause it's empty @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in .else # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ - ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in + @${REINPLACE_CMD} \ + -e 's|../lib/[^[:space:]]*||g' \ + -e 's|../findlib/[^[:space:]]*||g' \ + ${WRKSRC}/src/dird/Makefile.in \ + ${WRKSRC}/src/stored/Makefile.in \ + ${WRKSRC}/src/tools/Makefile.in .endif diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist index 9ac17ca37e62..c5d435dc7f6a 100644 --- a/sysutils/bacula-server/pkg-plist +++ b/sysutils/bacula-server/pkg-plist @@ -2,13 +2,10 @@ @sample(,bacula,) %%ETCDIR%%/bacula-dir.conf.sample @sample(,bacula,) %%ETCDIR%%/bacula-sd.conf.sample lib/libbaccats-%%LIB_VERSION%%.so -lib/libbaccats.la lib/libbaccats.so lib/libbaccats-%%DBTYPE%%-%%LIB_VERSION%%.so -lib/libbaccats-%%DBTYPE%%.la lib/libbaccats-%%DBTYPE%%.so lib/libbacsql-%%LIB_VERSION%%.so -lib/libbacsql.la lib/libbacsql.so sbin/bacula sbin/bacula-dir diff --git a/sysutils/bacula-server/pkg-plist.client b/sysutils/bacula-server/pkg-plist.client index bc2cc0d7d28b..07673651842c 100644 --- a/sysutils/bacula-server/pkg-plist.client +++ b/sysutils/bacula-server/pkg-plist.client @@ -1,13 +1,10 @@ @sample(,bacula,640) %%ETCDIR%%/bacula-fd.conf.sample @sample(,bacula,640) %%ETCDIR%%/bconsole.conf.sample lib/libbac-%%LIB_VERSION%%.so -lib/libbac.la lib/libbac.so lib/libbaccfg-%%LIB_VERSION%%.so -lib/libbaccfg.la lib/libbaccfg.so lib/libbacfind-%%LIB_VERSION%%.so -lib/libbacfind.la lib/libbacfind.so lib/bpipe-fd.so man/man8/bacula.8.gz diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 3b2225b5ec23..ef58f5da4e84 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -3,7 +3,7 @@ PORTNAME?= cdrdao PORTVERSION= 1.2.3 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= sysutils audio MASTER_SITES= SF MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION} diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile index 4c62f78fb12b..df9c19f85493 100644 --- a/sysutils/dvdbackup/Makefile +++ b/sysutils/dvdbackup/Makefile @@ -3,7 +3,7 @@ PORTNAME= dvdbackup PORTVERSION= 0.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/sysutils/fusefs-mp3fs/Makefile b/sysutils/fusefs-mp3fs/Makefile index 7615c1b63883..3fcafe864de5 100644 --- a/sysutils/fusefs-mp3fs/Makefile +++ b/sysutils/fusefs-mp3fs/Makefile @@ -3,6 +3,7 @@ PORTNAME= mp3fs PORTVERSION= 0.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils audio MASTER_SITES= https://github.com/khenriks/${PORTNAME}/releases/download/v${PORTVERSION}/ diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index c904e53df46c..8ce46b2e270c 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcdmaster -PORTREVISION= 5 +PORTREVISION= 6 COMMENT= GNOME frontend for cdrdao diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile index abcff0a50828..fc6360a63245 100644 --- a/sysutils/graveman/Makefile +++ b/sysutils/graveman/Makefile @@ -3,7 +3,7 @@ PORTNAME= graveman PORTVERSION= 0.3.12.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= sysutils MASTER_SITES= http://graveman.tuxfamily.org/sources/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/} diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index d36d3e96d64b..24f8954350fe 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= k3b PORTVERSION= 2.0.2 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= sysutils multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile index c6184cf4cc52..fc511b446056 100644 --- a/sysutils/libcdio/Makefile +++ b/sysutils/libcdio/Makefile @@ -3,6 +3,7 @@ PORTNAME= libcdio PORTVERSION= 0.92 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libcdio diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile index ff923eebc5a2..33b47db36282 100644 --- a/sysutils/logstalgia/Makefile +++ b/sysutils/logstalgia/Makefile @@ -3,7 +3,7 @@ PORTNAME= logstalgia PORTVERSION= 1.0.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils www MASTER_SITES= GOOGLE_CODE CRITICAL diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile index bf924b94018d..4efb924c04ce 100644 --- a/sysutils/mtpfs/Makefile +++ b/sysutils/mtpfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= mtpfs PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.adebenham.com/files/mtp/ diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile index 12d4aa40090c..a3a72c1dc057 100644 --- a/sysutils/tracker/Makefile +++ b/sysutils/tracker/Makefile @@ -4,6 +4,7 @@ PORTNAME= tracker PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile index 49f0f42ae71a..ed0b7b5bf45c 100644 --- a/sysutils/vobcopy/Makefile +++ b/sysutils/vobcopy/Makefile @@ -3,7 +3,7 @@ PORTNAME= vobcopy PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= http://vobcopy.org/download/ \ CRITICAL diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile index cea61f8cbc7f..c3eaad5c527f 100644 --- a/sysutils/xfburn/Makefile +++ b/sysutils/xfburn/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index a49a0b8164cc..472a1075929d 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.10.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} |