pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xlockmore: Fix some issues found by pkglint

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Dec 8 13:06:36 2021 +0100
Changeset:	66abb53fd7f847a95169c1ad3e277129ec5e8898

Modified Files:
	xlockmore/Makefile.common
	xlockmore/TODO
	xlockmore/distinfo
	xlockmore/patches/patch-config.cygport
	xlockmore/patches/patch-configure
	xlockmore/patches/patch-xlock_XLock.ad

Log Message:
xlockmore: Fix some issues found by pkglint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=66abb53fd7f847a95169c1ad3e277129ec5e8898

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xlockmore/Makefile.common              | 38 ++++++++++++++--------------------
 xlockmore/TODO                         |  6 +++---
 xlockmore/distinfo                     |  6 +++---
 xlockmore/patches/patch-config.cygport |  1 +
 xlockmore/patches/patch-configure      |  2 +-
 xlockmore/patches/patch-xlock_XLock.ad | 24 +--------------------
 6 files changed, 25 insertions(+), 52 deletions(-)

diffs:
diff --git a/xlockmore/Makefile.common b/xlockmore/Makefile.common
index 1cb6320f30..c4495ace49 100644
--- a/xlockmore/Makefile.common
+++ b/xlockmore/Makefile.common
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://sillycycle.com/xlockmore.html
+LICENSE=	modified-bsd
 
 DISTINFO_FILE?=		${.CURDIR}/../../wip/xlockmore/distinfo
 PATCHDIR?=		${.CURDIR}/../../wip/xlockmore/patches
@@ -33,7 +34,6 @@ PKG_OPTIONS_LEGACY_VARS+=	XLOCK_NO_DPMS:-xlockmore-dpms
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		xmkmf
 
-#XLOCK_SOUNDDIR=	${PREFIX}/lib/X11/xlock/sounds
 XLOCK_MODULEDIR=	${PREFIX}/lib/X11/xlock/modules
 
 DEFINES+=		-DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\""
@@ -114,28 +114,22 @@ INSTALLATION_DIRS+=	${EGDIR}/pam.d
 XINERAMA_ENV=	no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib
 CONFIGURE_ENV+=	ac_cv_path_xinerama=${XINERAMA_ENV:Q}
 
-# Set the complete paths to the sound files and set the default xlock
-# mode/screensaver.
-#
-post-patch:
-	cd ${WRKSRC}/xlock;						\
-	${MV} -f XLock.ad XLock.ad.presed;				\
-	${SED}	-e "s|/usr/lib/|${PREFIX}/lib/|g"			\
-		XLock.ad.presed > XLock.ad;				\
-	${RM} -f XLock.ad.presed
-.if defined(XLOCK_DEFAULT_MODE) && !empty(XLOCK_DEFAULT_MODE)
-	cd ${WRKSRC}/xlock;						\
-	${MV} -f XLock.ad XLock.ad.presed;				\
-	${SED} -e "s|^\(XLock.mode:[ 	]*\).*|\1${XLOCK_DEFAULT_MODE}|" \
-		XLock.ad.presed > XLock.ad;				\
-	${RM} -f XLock.ad.presed
-.endif
+# Modify paths in application defaults
+SUBST_CLASSES+=		adef
+SUBST_STAGE.adef=	pre-configure
+SUBST_MESSAGE.adef=	Preparing paths in xlock/XLock.ad file ...
+SUBST_FILES.adef=	xlock/XLock.ad
+SUBST_SED.adef=		-e 's|/usr/lib/|${PREFIX}/lib/|g'
+SUBST_SED.adef+=	-e 's|/usr/local/share/|${PREFIX}/share/|g'
+
+# Set the default xlock mode/screensaver.
+# XLOCK_DEFAULT_MODE can be defined by the user in mk.conf
+SUBST_CLASSES+=		mode
+SUBST_STAGE.mode=	pre-configure
+SUBST_MESSAGE.mode=	Preparing default mode in xlock/XLock.ad file ...
+SUBST_FILES.mode=	xlock/XLock.ad
+SUBST_SED.mode=		-e 's|^\(XLock.mode:[ 	]*\).*|\1${XLOCK_DEFAULT_MODE}|'
 
 post-install:
-#	${INSTALL_DATA_DIR} ${DESTDIR}${XLOCK_SOUNDDIR}
-#	cd ${WRKSRC}/sounds;						\
-#	for file in *.au; do						\
-#		${INSTALL_DATA} $$file ${DESTDIR}${XLOCK_SOUNDDIR};	\
-#	done
 	${INSTALL_DATA} ${FILESDIR}/pam-xlock-NetBSD \
 	    ${DESTDIR}${EGDIR}/pam.d/xlock-NetBSD
diff --git a/xlockmore/TODO b/xlockmore/TODO
index d0a33ef704..ecf420ac6f 100644
--- a/xlockmore/TODO
+++ b/xlockmore/TODO
@@ -1,5 +1,5 @@
 [X] Modify patches for new version
-[ ] License is missing
-[ ] Check paths in "patch-xlock_XLock.ad"
-[ ] Use SUBST framework for "Makefile.common"
+[X] License is missing
+[X] Check paths in "patch-xlock_XLock.ad"
+[X] Use SUBST framework for "Makefile.common"
 [ ] Check whether CVE-2006-0061 is fixed
diff --git a/xlockmore/distinfo b/xlockmore/distinfo
index e2746f61ba..f272194715 100644
--- a/xlockmore/distinfo
+++ b/xlockmore/distinfo
@@ -4,8 +4,8 @@ SHA1 (xlockmore-5.67.tar.xz) = e4d7ce5d840d1e6a3aaef701a33d2bf616de157a
 RMD160 (xlockmore-5.67.tar.xz) = 5ae56d3d26f8d8978f81c263ba75f2bf6bdb455b
 SHA512 (xlockmore-5.67.tar.xz) = d32ae6c11c9e2389a563b91f970c93d0e67028ac6406038985a416404679aaf7d6e15551d1cf4387d71f851a90d2a02a0a328c0af57265c839edfe40dfffaa65
 Size (xlockmore-5.67.tar.xz) = 2000040 bytes
-SHA1 (patch-config.cygport) = 8564137487d7b9289ef61434552fd684ee54e1f3
-SHA1 (patch-configure) = 2b8588a62c702c321ce4a96a9536aaa4959c6694
+SHA1 (patch-config.cygport) = 8370ee03566d700343880d6aa33b7482b3766a3e
+SHA1 (patch-configure) = 48bc780cf4241c43ca6a2502cf74e700e319c238
 SHA1 (patch-modes_Makefile.in) = 0a927c8927bd5c24eabb0078651b3813eea9227a
 SHA1 (patch-xglock_Makefile.in) = e5f3bf2054d4e7ea18d13c04f6bd94457d574ad1
-SHA1 (patch-xlock_XLock.ad) = b3d76fe6de1e0cd1eee9c6d3116dae8399d61707
+SHA1 (patch-xlock_XLock.ad) = 206c9bbcbde6e077d8c6fda8eb62513f59b98d82
diff --git a/xlockmore/patches/patch-config.cygport b/xlockmore/patches/patch-config.cygport
index 1956e7ad8b..277b93c778 100644
--- a/xlockmore/patches/patch-config.cygport
+++ b/xlockmore/patches/patch-config.cygport
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Fix unportable syntax in shell script.
+Patch was reported to upstream.
 
 --- config.cygport.orig	2019-12-05 00:56:37.000000000 +0000
 +++ config.cygport
diff --git a/xlockmore/patches/patch-configure b/xlockmore/patches/patch-configure
index 150becbe28..791d62e82d 100644
--- a/xlockmore/patches/patch-configure
+++ b/xlockmore/patches/patch-configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Do not modify LDFLAGS here.
+Modify handling of LDFLAGS.
 
 --- configure.orig	2020-06-04 14:43:47.000000000 +0000
 +++ configure
diff --git a/xlockmore/patches/patch-xlock_XLock.ad b/xlockmore/patches/patch-xlock_XLock.ad
index 6bb3a71ac1..2a2b2da85b 100644
--- a/xlockmore/patches/patch-xlock_XLock.ad
+++ b/xlockmore/patches/patch-xlock_XLock.ad
@@ -1,7 +1,6 @@
 $NetBSD$
 
-Disable fortune.
-Fix paths for pkgsrc.
+Modify path for fortune.
 
 --- xlock/XLock.ad.orig	2019-05-30 01:30:03.000000000 +0000
 +++ xlock/XLock.ad
@@ -20,24 +19,3 @@ Fix paths for pkgsrc.
  !XLock.program: /usr/games/fortune
  !XLock.program: finger
  !XLock.messagesfile: fortune.dat
-@@ -85,7 +85,7 @@ XLock.messagefont: -*-times-*-*-*-*-18-*
- ! For modes with images
- !XLock.*.bitmap: bitmaps/m-xlock.xbm
- !XLock.*.bitmap: pixmaps/m-xlock.xpm
--!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps
-+!XLock.*.bitmap: /usr/pkg/lib/X11/xlock/bitmaps
- 
- ! For mailbox check application
- !XLock.mailCmd: /usr/ucb/mail -e
-@@ -851,9 +851,9 @@ XLock.text3d.delay: 100000
- !XLock.text3d.cycles: 1
- !XLock.text3d.size: 1
- XLock.text3d.saturation: 1.0
--!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/arial.ttf
-+!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/arial.ttf
- ! Directory of only *.ttf fonts. symbol.ttf and wingding.ttf should be excluded
--!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/
-+!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/
- XLock.text3d.extrusion: 25.0
- XLock.text3d.rot_amplitude: 1.0
- XLock.text3d.rot_frequency: 0.001
Home | Main Index | Thread Index | Old Index