Page MenuHomeFreeBSD
Files F141000635

D21556.id61764.diff
No OneTemporary
Actions

D21556.id61764.diff
View Options

Index: x11/xlockmore/Makefile
===================================================================
--- x11/xlockmore/Makefile
+++ x11/xlockmore/Makefile
@@ -3,8 +3,8 @@
PORTNAME= xlockmore
PORTVERSION= 5.58
-PORTREVISION= 1
-CATEGORIES?= x11
+PORTREVISION= 2
+CATEGORIES= x11
MASTER_SITES= http://www.sillycycle.com/xlock/ \
SF/bsdsrc/${.CURDIR:T}
@@ -13,23 +13,20 @@
LICENSE= BSD2CLAUSE
-USES= tar:xz gnome xorg
+USES= tar:xz xorg
+USE_XORG= ice sm x11 xaw xext xpm
+
+LIB_DEPENDS= libfreetype.so:print/freetype2
-GNU_CONFIGURE= yes
-PORTDOCS= README ${PORTNAME}.README
CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \
--without-dtsaver --without-rplay --without-nas \
- --without-gtk --without-esound --disable-setuid
-
-USE_XORG= x11 xaw ice sm xpm xext xinerama
-
-LIB_DEPENDS+= libfreetype.so:print/freetype2 \
- libpng.so:graphics/png
+ --without-gtk --without-gtk2 --without-esound --disable-setuid
+GNU_CONFIGURE= yes
+PORTDOCS= README ${PORTNAME}.README
OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
- KERBEROS5 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \
- XINERAMA DOCS
-OPTIONS_DEFAULT= XINERAMA
+ BAD_PAM TIME_BOMB CUSTOMIZATION MAGICK JP XINERAMA DOCS
+OPTIONS_DEFAULT= MB XINERAMA
OPTIONS_SUB= yes
MESAGL_DESC= Mesa 3D (for GL modes)
@@ -39,7 +36,6 @@
NICE_ONLY_DESC= Only low cpu modes
BLANK_ONLY_DESC= Blank mode only (boring)
BAD_PAM_DESC= Xlock will ask PAM with root rights
-GTK2_DESC= Build Gtk2 graphical shell
XLOCK_GROUP_DESC= Allow xlock group to logout
TIME_BOMB_DESC= Allow autologout
CUSTOMIZATION_DESC= Allow tune through resource file
@@ -48,40 +44,36 @@
OPTIONS_RADIO= ONE
OPTIONS_RADIO_ONE= PAM XLOCK_GROUP
-NO_OPTIONS_SORT=yes
-
-JP_IMPLIES= MB
+NO_OPTIONS_SORT= yes
MAKE_ARGS+= bindir=${PREFIX}/bin \
mandir=${PREFIX}/man/man1 \
datarootdir=${PREFIX}/share \
xapploaddir=${PREFIX}/lib/X11/app-defaults
-MESAGL_CONFIGURE_WITH= mesa
-MESAGL_VARS= CFLAGS+="-I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2" USE_GL=yes
-MESAGL_LIB_DEPENDS= libftgl.so:graphics/ftgl
+MESAGL_CFLAGS= -I${LOCALBASE}/include/FTGL
MESAGL_CONFIGURE_ENV= XLOCKLIBS="-lpthread"
-MESAGL_CONFIGURE_OFF= --without-opengl --without-ftgl
-KERBEROS5_CONFIGURE_ENABLE= kerberos5
-KERBEROS5_VARS= CFLAGS+=-I${KRB5_HOME}/include KRB5LIB=-L${KRB5_HOME}/lib
-KERBEROS5_CONFIGURE_ENV= XLOCKLIBS="${KRB5LIB}"
+MESAGL_CONFIGURE_WITH= mesa opengl ftgl
+MESAGL_LIB_DEPENDS= libftgl.so:graphics/ftgl
+MESAGL_USES= gl
+MESAGL_USE= gl=gl,glu
BAD_PAM_CONFIGURE_ENABLE= bad-pam
PAM_CONFIGURE_ENABLE= pam
NICE_ONLY_CONFIGURE_ENABLE= nice-only
BLANK_ONLY_CONFIGURE_ENABLE= blank-only
-MB_CONFIGURE_ON= --enable-use-mb
-MB_CONFIGURE_OFF= --disable-mb
+MB_CONFIGURE_ENABLE= mb
SYSLOG_CONFIGURE_ENABLE= syslog
XINERAMA_CONFIGURE_WITH= xinerama
-DISABLE_ALLOW_ROOT_CONFIGURE_ON= --disable-allow-root
+XINERAMA_USE= xorg=xinerama
+DISABLE_ALLOW_ROOT_CONFIGURE_ENABLE= allow-root
XLOCK_GROUP_CONFIGURE_ENABLE= xlock-group
-TIME_BOMB_CONFIGURE_ENABLE= bomb
+TIME_BOMB_CONFIGURE_ENABLE= bomb
CUSTOMIZATION_CONFIGURE_ENABLE= customization
+JP_IMPLIES= MB
JP_VARS= XLOCKMORE_LANG=ja CATEGORIES+=japanese
-MAGICK_CONFIGURE_OFF= --without-magick
-MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6
-GTK2_CONFIGURE_WITH= gtk2
-GTK2_VARS+= USE_GNOME+=gtk20
+MAGICK_CONFIGURE_WITH= magick
+MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 \
+ libpng16.so:graphics/png
.include <bsd.port.options.mk>
@@ -89,10 +81,6 @@
CONFIGURE_ARGS+= --with-lang=${XLOCKMORE_LANG}
.endif
-.if ${PORT_OPTIONS:MKERBEROS5} && empty(KRB5_HOME)
-BROKEN= KRB5_HOME is undefined!
-.endif
-
.if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM)
pre-extract:
@${ECHO}
@@ -102,12 +90,10 @@
@${ECHO}
.endif
-post-patch:
- @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/Revisions ${STAGEDIR}${DOCSDIR}/${PORTNAME}.README
+ ${INSTALL_DATA} ${WRKSRC}/docs/Revisions \
+ ${STAGEDIR}${DOCSDIR}/${PORTNAME}.README
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Index: x11/xlockmore/pkg-plist
===================================================================
--- x11/xlockmore/pkg-plist
+++ x11/xlockmore/pkg-plist
@@ -1,4 +1,3 @@
-%%GTK2%%bin/xglock
@mode 4111
@owner root
bin/xlock
@@ -11,4 +10,3 @@
share/xlock/sounds/identify-please.au
share/xlock/sounds/not-programmed.au
share/xlock/sounds/thank-you.au
-%%GTK2%%share/xlock/xglockrc

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 2:47 PM (8 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27414252
Default Alt Text
D21556.id61764.diff (4 KB)

Event Timeline