ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/mports/trunk/x11/gdm/Makefile
(Generate patch)

Comparing trunk/x11/gdm/Makefile (file contents):
Revision 24921 by laffer1, Sun Jul 22 16:54:58 2018 UTC vs.
Revision 24922 by laffer1, Sat Feb 9 16:31:07 2019 UTC

# Line 1 | Line 1
1   # $MidnightBSD$
2  
3   PORTNAME=       gdm
4 < PORTVERSION=    3.16.4
5 < PORTREVISION=   1
4 > PORTVERSION=    3.28.1
5   CATEGORIES=     x11 gnome
6   MASTER_SITES=   GNOME
7 < DIST_SUBDIR=    gnome3
7 > DIST_SUBDIR=    gnome
8  
9   MAINTAINER=     ports@MidnightBSD.org
10 < COMMENT=        GNOME 3 version of xdm display manager
10 > COMMENT=        GNOME 3 display manager
11  
12   LICENSE=        gpl2
13  
14 < BUILD_DEPENDS=  zenity>=3.0.0:${PORTSDIR}/x11/zenity \
15 <                itstool:${PORTSDIR}/textproc/itstool \
16 <                iso-codes>=0:${PORTSDIR}/misc/iso-codes
17 < LIB_DEPENDS=    libck-connector.so:${PORTSDIR}/sysutils/consolekit2 \
18 <                libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
19 <                libupower-glib.so:${PORTSDIR}/sysutils/upower \
20 <                libnss3.so:${PORTSDIR}/security/nss \
21 <                libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
22 <                libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
23 <                libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
24 < RUN_DEPENDS=    zenity>=3.0.0:${PORTSDIR}/x11/zenity \
25 <                gnome-shell>=3.15.92:${PORTSDIR}/x11/gnome-shell \
26 <                gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
27 <                gnome-keyring-3:${PORTSDIR}/security/gnome-keyring \
28 <                gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
29 <                gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
31 <                polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \
32 <                at-spi2-core>=0:${PORTSDIR}/accessibility/at-spi2-core \
33 <                iso-codes>=0:${PORTSDIR}/misc/iso-codes
14 > BUILD_DEPENDS=  zenity>=3.0.0:x11/zenity \
15 >                itstool:textproc/itstool \
16 >                iso-codes>=0:misc/iso-codes
17 > LIB_DEPENDS=    libck-connector.so:sysutils/consolekit2 \
18 >                libaccountsservice.so:sysutils/accountsservice \
19 >                libcanberra.so:audio/libcanberra \
20 >                libcanberra-gtk3.so:audio/libcanberra-gtk3
21 > RUN_DEPENDS=    zenity>=3.0.0:x11/zenity \
22 >                gnome-shell>=3.15.92:x11/gnome-shell \
23 >                gnome-settings-daemon>=3.0.0:sysutils/gnome-settings-daemon \
24 >                gnome-keyring-3:security/gnome-keyring \
25 >                gnome-session>=3.0.0:x11/gnome-session \
26 >                gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
27 >                polkit-gnome>=0.105:sysutils/polkit-gnome \
28 >                at-spi2-core>=0:accessibility/at-spi2-core \
29 >                iso-codes>=0:misc/iso-codes
30   # used in scripts
31 < RUN_DEPENDS+=   xrdb:${PORTSDIR}/x11/xrdb \
32 <                setxkbmap:${PORTSDIR}/x11/setxkbmap \
33 <                xmodmap:${PORTSDIR}/x11/xmodmap \
34 <                xterm:${PORTSDIR}/x11/xterm
31 > RUN_DEPENDS+=   xrdb:x11/xrdb \
32 >                setxkbmap:x11/setxkbmap \
33 >                xsetroot:x11/xsetroot \
34 >                xhost:x11/xhost \
35 >                xmodmap:x11/xmodmap \
36 >                xterm:x11/xterm
37  
38   USERS=          gdm
39 < GROUPS=         gdm
39 > GROUPS=         gdm video
40  
41 < USES=           cpe execinfo gettext gmake libtool pathfix pkgconfig tar:xz
41 > PORTSCOUT=      limitw:1,even
42 >
43 > USES=           cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz
44   CPE_VENDOR=     gnome
45   CPE_VENDOR=     gnome_display_manager
46 < USE_GNOME=      dconf intlhack introspection librsvg2
46 > USE_GNOME=      cairo dconf gtk30 intltool introspection
47   USE_LDCONFIG=   yes
48 < USE_XORG=       dmx dmxproto
48 > USE_XORG=       x11 xau xcb xdmcp xorgproto
49   INSTALLS_ICONS= yes
50   USE_RC_SUBR=    gdm
51   USE_GNOME_SUBR= yes
# Line 59 | Line 59 | CONFIGURE_ARGS=        --disable-static \
59                  --with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
60                  --with-log-dir=/var/log/gdm \
61                  --localstatedir=/var \
62 +                --without-selinux \
63 +                --without-libaudit \
64                  --with-console-kit \
65                  --with-working-directory=${PREFIX}/etc/gdm/home \
66                  --with-sysconfsubdir=gdm \
# Line 67 | Line 69 | CONFIGURE_ARGS=        --disable-static \
69                  --with-screenshot-dir=/var/run/gdm/greeter \
70                  --enable-authentication-scheme=pam \
71                  --without-plymouth \
72 +                --without-systemd \
73                  --with-user=gdm \
74                  --with-group=gdm \
75 <                --with-initial-vt=09 \
75 >                --with-initial-vt=09 \
76 >                --enable-gdm-xsession \
77                  --disable-wayland-support \
78                  --with-systemd=no
79  
# Line 90 | Line 94 | PKGMESSAGE=    ${WRKDIR}/pkg-message
94  
95   GNOME_LOCALSTATEDIR=    /var
96  
97 < OPTIONS_DEFINE= IPV6 KEYRING
98 < OPTIONS_DEFAULT=KEYRING
95 < KEYRING_DESC=   Gnomekeyring/PAM integration
96 < KEYRING_LIB_DEPENDS=    libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
97 > OPTIONS_DEFINE= IPV6
98 >
99   IPV6_CONFIGURE_ENABLE=  ipv6
100  
101 < .include <bsd.mport.options.mk>
101 > .include <bsd.port.options.mk>
102  
103   .if defined(WITH_DEBUG)
104   CONFIGURE_ARGS+=        --enable-debug
105   .endif
106  
105 .if ${PORT_OPTIONS:MKEYRING}
106 SUB_LIST+=      PAM_KEYRING=
107 .else
108 SUB_LIST+=      PAM_KEYRING=\#
109 .endif
110
107   post-patch:
108          @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
109                  ${WRKSRC}/data/Makefile.in
110          @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
111 <                -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
112 <                ${WRKSRC}/daemon/gdm-session-worker.c
111 >                -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
112 >                -e 's|/bin/bash|/bin/sh|g' \
113 >                ${WRKSRC}/daemon/gdm-session-worker.c
114          @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
115                  -e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
116                  -e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
117                  ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
118          @${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
119 <                ${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
120 <                ${WRKSRC}/gui/simple-chooser/chooser-main.c
119 >                ${WRKSRC}/chooser/gdm-host-chooser.c \
120 >                ${WRKSRC}/chooser/chooser-main.c
121          @${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
122                  ${WRKSRC}/data/Init.in \
123                  ${WRKSRC}/data/PostLogin \
124                  ${WRKSRC}/data/PostSession.in \
125                  ${WRKSRC}/data/PreSession.in \
126                  ${WRKSRC}/data/Xsession.in
127 <        -${RM}  ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
127 >        @${RM}  ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
128                  ${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
129                  ${WRKSRC}/data/applications/gnome-shell.desktop \
130  
# Line 147 | Line 144 | post-install:
144          ${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home
145          ${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
146  
147 <        ${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
148 <        ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
149 <        ${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
147 >        ${INSTALL_DATA} ${WRKDIR}/gdm-autologin \
148 >                ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
149 >        ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment \
150 >                ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
151 >        ${INSTALL_DATA} ${WRKDIR}/gdm-password \
152 >                ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
153  
154 <        ${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
154 >        ${INSTALL_DATA} ${WRKDIR}/client.conf \
155 >                ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/client.conf.sample
156  
157 <        ${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/
157 >        ${INSTALL_DATA} ${WRKDIR}/locale.conf \
158 >                ${STAGEDIR}${PREFIX}/etc/gdm/locale.conf.sample
159  
160 +        @${RM} ${STAGEDIR}${PREFIX}/lib/udev/rules.d/61-gdm.rules
161 +        @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev/rules.d
162 +        @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev
163 +
164          @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
165                  | /usr/bin/fmt 75 79 > ${PKGMESSAGE}
160
161 # logwtmp lives here.
162 .if ${OSVERSION} < 4015
163 CONFIGLIBS+=    -lutil
164 .endif
166  
167   .include <bsd.port.mk>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines