diff --git a/x11/gnome/control-center/Makefile b/x11/gnome/control-center/Makefile index c44c3f988a5..22b4b1ac4d0 100644 --- a/x11/gnome/control-center/Makefile +++ b/x11/gnome/control-center/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2017/06/28 12:22:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.30 2017/06/29 13:54:13 ajacoutot Exp $ # XXX change proxy settings without network-manager? @@ -6,7 +6,7 @@ COMMENT= GNOME control center GNOME_PROJECT= gnome-control-center GNOME_VERSION= 3.24.2 -REVISION= 0 +REVISION= 1 CATEGORIES= x11 @@ -106,12 +106,4 @@ pre-configure: autoreconf -fi ### -# XXX should probably live in a common package -# get_os_info() in panels/info/cc-info-panel.c -SUBST_VARS= OSREV -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-control-center - ${SUBST_CMD} -c -o root -g wheel -m 0644 ${FILESDIR}/os-release.in \ - ${PREFIX}/share/examples/gnome-control-center/os-release - .include diff --git a/x11/gnome/control-center/files/os-release.in b/x11/gnome/control-center/files/os-release.in deleted file mode 100644 index 004d61da7f9..00000000000 --- a/x11/gnome/control-center/files/os-release.in +++ /dev/null @@ -1,18 +0,0 @@ -# $OpenBSD: os-release.in,v 1.1 2017/06/28 12:22:28 ajacoutot Exp $ -# -# https://www.freedesktop.org/software/systemd/man/os-release.html - -NAME=OpenBSD -VERSION=${OSREV} -ID=openbsd -#ID_LIKE= -#VERSION_CODENAME= -VERSION_ID=${OSREV} -PRETTY_NAME="OpenBSD/${ARCH} ${OSREV}" -#ANSI_COLOR= -CPE_NAME="cpe:/o:openbsd:openbsd:${OSREV}" -HOME_URL="https://www.openbsd.org/" -#SUPPORT_URL= -BUG_REPORT_URL="https://www.openbsd.org/report.html" -#PRIVACY_POLICY_URL= -#BUILD_ID= diff --git a/x11/gnome/control-center/pkg/PLIST b/x11/gnome/control-center/pkg/PLIST index 95132e49d8e..e4c21f7a800 100644 --- a/x11/gnome/control-center/pkg/PLIST +++ b/x11/gnome/control-center/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2017/06/28 12:22:28 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.10 2017/06/29 13:54:13 ajacoutot Exp $ @conflict control-center-1* @conflict control-center2-* @conflict gnome-media-<2.91.2p3 @@ -30,9 +30,6 @@ share/applications/gnome-user-accounts-panel.desktop share/bash-completion/completions/gnome-control-center share/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service share/dbus-1/services/org.gnome.ControlCenter.service -share/examples/gnome-control-center/ -share/examples/gnome-control-center/os-release -@sample ${SYSCONFDIR}/os-release share/gettext/its/gnome-keybindings.its share/gettext/its/gnome-keybindings.loc share/gnome-control-center/