cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert /etc/os-release addition; while it fixes the immediate problem here,

Browse Source 
it may lead to inconsistent behaviour in other applications (thinking we
are Linux).

thank you sthen@ for the ports source grep(1)
This commit is contained in:
ajacoutot 2017-06-29 13:54:13 +00:00
parent 3d708abfa5
commit c74160473e
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/gnome/control-center/Makefile
View File

@ -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 <bsd.port.mk>

18
x11/gnome/control-center/files/os-release.in
View File

@ -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=

5
x11/gnome/control-center/pkg/PLIST
View File

@ -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/