aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2018-07-31 18:41:30 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2018-07-31 18:41:30 +0000
commit15dac70c75ad7e5286c80ca05c69fbfc1061905c (patch)
tree71f4780cd34e184b043831e0db99b92f22e0da0d /x11-fonts
parente81287c37b3d7ec77e4687a96e63839a01baeb30 (diff)
downloadports-15dac70c75ad7e5286c80ca05c69fbfc1061905c.tar.gz
ports-15dac70c75ad7e5286c80ca05c69fbfc1061905c.zip
Switch to xorgproto instead of individual packages
Upstream used to distribute protocol headers as separate packages, but has decided to merge those to a common package, named xorgproto. This update tracks that change. * Add a new port, x11/xorgproto, with are protocol headers for xorg. * Hook the new protocol port to the build and to infrastructure in bsd.xorg.mk. * Update all ports with a dependency on any of the old *proto packages to instead depend on xorgproto. Bump portrevision. * Delete the old *proto packages, update MOVED. PR: 230023 Submitted by: zeising Approved by: portmgr (antoine) exp-run by: antoine
Notes
Notes: svn path=/head/; revision=476013
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/Makefile3
-rw-r--r--x11-fonts/bdftopcf/Makefile3
-rw-r--r--x11-fonts/fontcacheproto/Makefile16
-rw-r--r--x11-fonts/fontcacheproto/distinfo2
-rw-r--r--x11-fonts/fontcacheproto/pkg-descr3
-rw-r--r--x11-fonts/fontcacheproto/pkg-plist4
-rw-r--r--x11-fonts/fontsproto/Makefile17
-rw-r--r--x11-fonts/fontsproto/distinfo2
-rw-r--r--x11-fonts/fontsproto/pkg-descr3
-rw-r--r--x11-fonts/fontsproto/pkg-plist8
-rw-r--r--x11-fonts/fonttosfnt/Makefile4
-rw-r--r--x11-fonts/libFS/Makefile3
-rw-r--r--x11-fonts/libXfont/Makefile3
-rw-r--r--x11-fonts/libXfont2/Makefile3
-rw-r--r--x11-fonts/libXfontcache/Makefile4
-rw-r--r--x11-fonts/libXft/Makefile4
-rw-r--r--x11-fonts/libfontenc/Makefile4
-rw-r--r--x11-fonts/mkfontscale/Makefile3
-rw-r--r--x11-fonts/xf86bigfontproto/Makefile16
-rw-r--r--x11-fonts/xf86bigfontproto/distinfo2
-rw-r--r--x11-fonts/xf86bigfontproto/pkg-descr3
-rw-r--r--x11-fonts/xf86bigfontproto/pkg-plist4
22 files changed, 18 insertions, 96 deletions
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 7768c8a030e8..033085228ac0 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -93,12 +93,10 @@
SUBDIR += font-util
SUBDIR += font-winitzki-cyrillic
SUBDIR += font-xfree86-type1
- SUBDIR += fontcacheproto
SUBDIR += fontconfig
SUBDIR += fontconfig-reference
SUBDIR += fontmatrix
SUBDIR += fonts-indic
- SUBDIR += fontsproto
SUBDIR += fonttosfnt
SUBDIR += freefont-ttf
SUBDIR += freefonts
@@ -196,7 +194,6 @@
SUBDIR += vollkorn-ttf
SUBDIR += webfonts
SUBDIR += wqy
- SUBDIR += xf86bigfontproto
SUBDIR += xfontsel
SUBDIR += xfs
SUBDIR += xfsinfo
diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index 2f1dd60c57af..923590d9e23d 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bdftopcf
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= localbase
XORG_CAT= app
-USE_XORG= fontsproto xproto
+USE_XORG= xorgproto
PLIST_FILES= bin/bdftopcf man/man1/bdftopcf.1.gz
diff --git a/x11-fonts/fontcacheproto/Makefile b/x11-fonts/fontcacheproto/Makefile
deleted file mode 100644
index b6e2f99f0aef..000000000000
--- a/x11-fonts/fontcacheproto/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Dejan Lesjak <lesi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= fontcacheproto
-PORTVERSION= 0.1.3
-CATEGORIES= x11-fonts
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= Fontcache extension headers
-
-LICENSE= BSD2CLAUSE
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-XORG_CAT= proto
-
-.include <bsd.port.mk>
diff --git a/x11-fonts/fontcacheproto/distinfo b/x11-fonts/fontcacheproto/distinfo
deleted file mode 100644
index a1f09183ed05..000000000000
--- a/x11-fonts/fontcacheproto/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = 1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb
-SIZE (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = 84470
diff --git a/x11-fonts/fontcacheproto/pkg-descr b/x11-fonts/fontcacheproto/pkg-descr
deleted file mode 100644
index e168bb607399..000000000000
--- a/x11-fonts/fontcacheproto/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains X.Org Fontcache extension headers.
-
-WWW: https://www.freedesktop.org/wiki/Software/xlibs/
diff --git a/x11-fonts/fontcacheproto/pkg-plist b/x11-fonts/fontcacheproto/pkg-plist
deleted file mode 100644
index 595a1b11e676..000000000000
--- a/x11-fonts/fontcacheproto/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-include/X11/extensions/fontcache.h
-include/X11/extensions/fontcacheP.h
-include/X11/extensions/fontcachstr.h
-libdata/pkgconfig/fontcacheproto.pc
diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile
deleted file mode 100644
index 12abbda2354e..000000000000
--- a/x11-fonts/fontsproto/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Dejan Lesjak <lesi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= fontsproto
-PORTVERSION= 2.1.3
-PORTEPOCH= 1
-CATEGORIES= x11-fonts
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= Fonts extension headers
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-XORG_CAT= proto
-
-.include <bsd.port.mk>
diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo
deleted file mode 100644
index ac15338391a4..000000000000
--- a/x11-fonts/fontsproto/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/proto/fontsproto-2.1.3.tar.bz2) = 259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8
-SIZE (xorg/proto/fontsproto-2.1.3.tar.bz2) = 154087
diff --git a/x11-fonts/fontsproto/pkg-descr b/x11-fonts/fontsproto/pkg-descr
deleted file mode 100644
index 495c40d30c3b..000000000000
--- a/x11-fonts/fontsproto/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains X.Org fontsproto protocol headers.
-
-WWW: https://www.freedesktop.org/wiki/Software/xlibs/
diff --git a/x11-fonts/fontsproto/pkg-plist b/x11-fonts/fontsproto/pkg-plist
deleted file mode 100644
index 05119c782e00..000000000000
--- a/x11-fonts/fontsproto/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%DOCSDIR%%/fsproto.xml
-include/X11/fonts/FS.h
-include/X11/fonts/FSproto.h
-include/X11/fonts/font.h
-include/X11/fonts/fontproto.h
-include/X11/fonts/fontstruct.h
-include/X11/fonts/fsmasks.h
-libdata/pkgconfig/fontsproto.pc
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 0a0cff1418ff..1a8afd431fd4 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fonttosfnt
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Wrap a bitmap font in a sftn wrapper
LIB_DEPENDS= libfreetype.so:print/freetype2
XORG_CAT= app
-USE_XORG= xproto fontenc
+USE_XORG= xorgproto fontenc
PLIST_FILES= bin/fonttosfnt man/man1/fonttosfnt.1.gz
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 635804150eda..89381af2fae5 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -2,13 +2,14 @@
PORTNAME= libFS
PORTVERSION= 1.0.7
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
COMMENT= The FS library
XORG_CAT= lib
-USE_XORG= fontsproto:both xproto:both xtrans
+USE_XORG= xorgproto xtrans
USES+= cpe
CPE_PRODUCT= libfs
CPE_VENDOR= x
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 57343d8a778e..d0767cab7b4f 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXfont
PORTVERSION= 1.5.4
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-fonts
@@ -17,7 +18,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2
USES= cpe
XORG_CAT= lib
-USE_XORG= xproto:both xtrans fontsproto:both fontenc
+USE_XORG= xorgproto xtrans fontenc
INSTALL_TARGET= install-strip
CPE_PRODUCT= libxfont
CPE_VENDOR= x
diff --git a/x11-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile
index 8f5b175b6ee0..3229efe69fb6 100644
--- a/x11-fonts/libXfont2/Makefile
+++ b/x11-fonts/libXfont2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXfont2
PORTVERSION= 2.0.3
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -11,7 +12,7 @@ COMMENT= X font library
LIB_DEPENDS= libfreetype.so:print/freetype2
XORG_CAT= lib
-USE_XORG= xproto:both xtrans fontsproto:both fontenc
+USE_XORG= xorgproto xtrans fontenc
INSTALL_TARGET= install-strip
#USES+= cpe
#CPE_PRODUCT= libxfont
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index 380014203645..0dc720a5103b 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -2,13 +2,13 @@
PORTNAME= libXfontcache
PORTVERSION= 1.0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
COMMENT= The Xfontcache library
XORG_CAT= lib
-USE_XORG= fontcacheproto:both x11 xext xextproto
+USE_XORG= x11 xext xorgproto
.include <bsd.port.mk>
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 031aea621fda..190aec433edc 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXft
PORTVERSION= 2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= gnome@FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
XORG_CAT= lib
-USE_XORG= xproto:both xrender
+USE_XORG= xorgproto xrender
INSTALL_TARGET= install-strip
post-extract:
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index e33de45519a4..0f976959397b 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libfontenc
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= lib
-USE_XORG= xproto
+USE_XORG= xorgproto
CONFIGURE_ARGS= --with-encodingsdir=${LOCALBASE}/share/fonts/encodings
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 5e4a0b261fd9..2f221df277fc 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mkfontscale
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:print/freetype2
XORG_CAT= app
-USE_XORG= xproto fontenc
+USE_XORG= xorgproto fontenc
CONFIGURE_ARGS+=--disable-maintainer-mode
diff --git a/x11-fonts/xf86bigfontproto/Makefile b/x11-fonts/xf86bigfontproto/Makefile
deleted file mode 100644
index 440353870991..000000000000
--- a/x11-fonts/xf86bigfontproto/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= xf86bigfontproto
-PORTVERSION= 1.2.0
-CATEGORIES= x11-fonts
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= XFree86-Bigfont extension headers
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-XORG_CAT= proto
-
-.include <bsd.port.mk>
diff --git a/x11-fonts/xf86bigfontproto/distinfo b/x11-fonts/xf86bigfontproto/distinfo
deleted file mode 100644
index 69d1319be5c3..000000000000
--- a/x11-fonts/xf86bigfontproto/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
-SIZE (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = 49191
diff --git a/x11-fonts/xf86bigfontproto/pkg-descr b/x11-fonts/xf86bigfontproto/pkg-descr
deleted file mode 100644
index c2d38744b1bb..000000000000
--- a/x11-fonts/xf86bigfontproto/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains X.Org XFree86-Bigfont extension headers.
-
-WWW: https://www.freedesktop.org/wiki/Software/xlibs/
diff --git a/x11-fonts/xf86bigfontproto/pkg-plist b/x11-fonts/xf86bigfontproto/pkg-plist
deleted file mode 100644
index a0e8e8ec76b2..000000000000
--- a/x11-fonts/xf86bigfontproto/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfproto.h
-include/X11/extensions/xf86bigfstr.h
-libdata/pkgconfig/xf86bigfontproto.pc
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 09:16:21 +0000