pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc fixesproto4: remove, part of xorgproto
details: https://anonhg.NetBSD.org/pkgsrc/rev/b45924ae9d0b
branches: trunk
changeset: 444944:b45924ae9d0b
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Jan 14 17:46:48 2021 +0000
description:
fixesproto4: remove, part of xorgproto
diffstat:
doc/CHANGES-2021 | 3 +-
x11/Makefile | 3 +-
x11/fixesproto4/DESCR | 2 -
x11/fixesproto4/Makefile | 29 ----------------
x11/fixesproto4/PLIST | 4 --
x11/fixesproto4/buildlink3.mk | 18 ----------
x11/fixesproto4/builtin.mk | 77 -------------------------------------------
x11/fixesproto4/distinfo | 6 ---
8 files changed, 3 insertions(+), 139 deletions(-)
diffs (191 lines):
diff -r 16ee5e680b9e -r b45924ae9d0b doc/CHANGES-2021
--- a/doc/CHANGES-2021 Thu Jan 14 17:44:01 2021 +0000
+++ b/doc/CHANGES-2021 Thu Jan 14 17:46:48 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.383 2021/01/14 17:44:01 wiz Exp $
+$NetBSD: CHANGES-2021,v 1.384 2021/01/14 17:46:48 wiz Exp $
Changes to the packages collection and infrastructure in 2021:
@@ -470,3 +470,4 @@
Updated www/libmicrohttpd to 0.9.72nb1 [wiz 2021-01-14]
Updated www/libmicrohttpd to 0.9.72nb2 [wiz 2021-01-14]
Removed x11/Xfixes successor x11/libXfixes [wiz 2021-01-14]
+ Removed x11/fixesproto4 successor x11/xorgproto [wiz 2021-01-14]
diff -r 16ee5e680b9e -r b45924ae9d0b x11/Makefile
--- a/x11/Makefile Thu Jan 14 17:44:01 2021 +0000
+++ b/x11/Makefile Thu Jan 14 17:46:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.915 2021/01/14 17:44:01 wiz Exp $
+# $NetBSD: Makefile,v 1.916 2021/01/14 17:46:48 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -53,7 +53,6 @@
SUBDIR+= eterm
SUBDIR+= fbdesk
SUBDIR+= filerunner
-SUBDIR+= fixesproto4
SUBDIR+= fltk
SUBDIR+= fltk13
SUBDIR+= fox
diff -r 16ee5e680b9e -r b45924ae9d0b x11/fixesproto4/DESCR
--- a/x11/fixesproto4/DESCR Thu Jan 14 17:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This provides the Fixes extension headers from modular X.org X11
-project, specifically for use with Xfixes and native X11.
diff -r 16ee5e680b9e -r b45924ae9d0b x11/fixesproto4/Makefile
--- a/x11/fixesproto4/Makefile Thu Jan 14 17:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2020/01/18 23:35:48 rillig Exp $
-#
-# This package is for use with Xfixes only. Do not update to later versions.
-
-DISTNAME= fixesproto-4.0
-PKGREVISION= 1
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= joerg%NetBSD.org@localhost
-HOMEPAGE= https://xorg.freedesktop.org/
-COMMENT= Fixes extension headers from X.org
-
-CONFLICTS+= fixesext-[0-9]*
-
-GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/fixesproto.pc.in
-USE_LANGUAGES= # none, not even C
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+= "This package is for native X11 only; use libXfixes instead."
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 16ee5e680b9e -r b45924ae9d0b x11/fixesproto4/PLIST
--- a/x11/fixesproto4/PLIST Thu Jan 14 17:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/08 00:39:31 abs Exp $
-include/X11/extensions/xfixesproto.h
-include/X11/extensions/xfixeswire.h
-lib/pkgconfig/fixesproto.pc
diff -r 16ee5e680b9e -r b45924ae9d0b x11/fixesproto4/buildlink3.mk
--- a/x11/fixesproto4/buildlink3.mk Thu Jan 14 17:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:34 wiz Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-BUILDLINK_DEPMETHOD.fixesproto?= build
-
-BUILDLINK_TREE+= fixesproto
-
-.if !defined(FIXESPROTO_BUILDLINK3_MK)
-FIXESPROTO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=3.0.0<5
-BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto4
-
-.include "../../x11/xorgproto/buildlink3.mk"
-.endif # FIXESPROTO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -fixesproto
diff -r 16ee5e680b9e -r b45924ae9d0b x11/fixesproto4/builtin.mk
--- a/x11/fixesproto4/builtin.mk Thu Jan 14 17:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:08 rillig Exp $
-
-BUILTIN_PKG:= fixesproto
-
-BUILTIN_FIND_FILES_VAR:= H_XFIXESPROTO H_XFIXESWIRE
-BUILTIN_FIND_FILES.H_XFIXESPROTO= \
- ${X11BASE}/include/X11/extensions/xfixesproto.h
-BUILTIN_FIND_FILES.H_XFIXESWIRE= \
- ${X11BASE}/include/X11/extensions/xfixeswire.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if ${X11BASE} == ${LOCALBASE}
-IS_BUILTIN.fixesproto= no
-.elif !defined(IS_BUILTIN.fixesproto)
-IS_BUILTIN.fixesproto= no
-#
-# Here, we skip checking whether the files are under ${LOCALBASE} since
-# we'll consider this X11 package to be built-in even if it's a part
-# of one of the pkgsrc-installed X11 distributions.
-#
-. if empty(H_XFIXESPROTO:M__nonexistent__) && \
- empty(H_XFIXESWIRE:M__nonexistent__)
-IS_BUILTIN.fixesproto= yes
-. endif
-.endif
-MAKEVARS+= IS_BUILTIN.fixesproto
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.fixesproto)
-. if ${PREFER.fixesproto} == "pkgsrc"
-USE_BUILTIN.fixesproto= no
-. else
-USE_BUILTIN.fixesproto= ${IS_BUILTIN.fixesproto}
-. if defined(BUILTIN_PKG.fixesproto) && \
- !empty(IS_BUILTIN.fixesproto:M[yY][eE][sS])
-USE_BUILTIN.fixesproto= yes
-. for _dep_ in ${BUILDLINK_API_DEPENDS.fixesproto}
-. if !empty(USE_BUILTIN.fixesproto:M[yY][eE][sS])
-USE_BUILTIN.fixesproto!= \
- if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesproto:Q}; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. endif
-. endfor
-. endif
-. endif # PREFER.fixesproto
-.endif
-MAKEVARS+= USE_BUILTIN.fixesproto
-
-.include "../../mk/x11.builtin.mk"
-
-CHECK_BUILTIN.fixesproto?= no
-.if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO])
-
-# following so old pkg-config name fixesext.pc will be available
-# this is temporary and can be removed once not used
-BUILDLINK_TARGETS+= fixesext-symlink-pc
-
-fixesext-symlink-pc:
- src=${BUILDLINK_PREFIX.fixesproto}/lib/pkgconfig/fixesproto.pc \
- dst=${BUILDLINK_DIR}/lib/pkgconfig/fixesext.pc; \
- ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
- if ${TEST} -f $${src}; then \
- ${LN} -sf $${src} $${dst}; \
- fi
-
-.endif # CHECK_BUILTIN.fixesproto
diff -r 16ee5e680b9e -r b45924ae9d0b x11/fixesproto4/distinfo
--- a/x11/fixesproto4/distinfo Thu Jan 14 17:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:28:29 agc Exp $
-
-SHA1 (fixesproto-4.0.tar.bz2) = de9139e4836f1ab234583406ea2ee6446ad7965f
-RMD160 (fixesproto-4.0.tar.bz2) = fc1c2130ae89a88365cb039a5e9ffb8c6651c16e
-SHA512 (fixesproto-4.0.tar.bz2) = 87135adeeaf7e032605dd1ca5ea085069e29a07d44be2083838d488a4299b7999785ae2f5bfebf77ed74b74c348c6119f5ca653dcc462a825f0ca39fa8219377
-Size (fixesproto-4.0.tar.bz2) = 38550 bytes
Home |
Main Index |
Thread Index |
Old Index