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

star: Update to release 2019-09-22

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Oct 4 13:31:01 2019 +0200
Changeset:	8aea0444770aebcc87d91e0c0ac35ca5e16ae3c2

Modified Files:
	star/COMMIT_MSG
	star/Makefile
	star/PLIST
	star/distinfo
Added Files:
	star/files/INSTALL.pkgsrc
Removed Files:
	star/MESSAGE.star

Log Message:
star: Update to release 2019-09-22

Replaced MESSAGE with share/doc/star/INSTALL.pkgsrc

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

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

diffstat:
 star/COMMIT_MSG           | 17 ++++++++++++++++-
 star/MESSAGE.star         | 14 --------------
 star/Makefile             | 25 ++++++++++++++++---------
 star/PLIST                |  1 +
 star/distinfo             |  8 ++++----
 star/files/INSTALL.pkgsrc |  9 +++++++++
 6 files changed, 46 insertions(+), 28 deletions(-)

diffs:
diff --git a/star/COMMIT_MSG b/star/COMMIT_MSG
index fd0ba25047..cf67faf96b 100644
--- a/star/COMMIT_MSG
+++ b/star/COMMIT_MSG
@@ -1,7 +1,8 @@
-smake: Update to 1.6.1
+star: Update to 1.6.1
 
 Switch to latest distfile.
 Update PLIST.
+Replaced MESSAGE with share/doc/star/INSTALL.pkgsrc.
 
 Changelog
 =========
@@ -338,3 +339,17 @@ Release 2019-08-13:
   or Linux with non-contiguous minor bits. The warning is not needed
   since we only use SCHILY.dev in order to detect mount points but
   not to compute the major/minor parts.
+
+Release 2019-08-13:
+- star: star -xdev -find typically works to exclude mounted files.
+  It still does not always do what is expected, e.g. in case that /proc
+  is in the tree of scanned files, where files deep in the new mounted
+  tree suddenly have the same FS ID as other filesystems, e.g. the file
+  /proc/<pid>/path/a.out.
+
+  In such cases, "star -find -xdev" is still recommended where the
+  mounted file exclusion is done inside libfind instead of being
+  done inside star.
+
+  Before, files on other filesystems have not been honored at all when
+  using "star -xdev -find ...".
diff --git a/star/MESSAGE.star b/star/MESSAGE.star
deleted file mode 100644
index e45888ac69..0000000000
--- a/star/MESSAGE.star
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.star,v 1.1 2018/11/10 19:56:17 wiz Exp $
-
-Note: The location of the ${PKGNAME_NOREV} `defaults' file has been set to
-
-	${STAR_CONF}
-
-This is the pkgsrc standard config file location, NOT the ${PKGNAME_NOREV}
-standard location, which is /etc/default/star.
-
-The reason for this is that pkgsrc packages should not use configuration
-files outside ${LOCALBASE} unless they are explicitly set by the user.
-
-===========================================================================
diff --git a/star/Makefile b/star/Makefile
index c107691785..915b53de26 100644
--- a/star/Makefile
+++ b/star/Makefile
@@ -1,7 +1,8 @@
 # $NetBSD$
 
-DISTNAME=	schily-2019-08-13
+DISTNAME=	schily-2019-09-22
 PKGNAME=	star-1.6.1
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,19 +24,14 @@ MAKE_FLAGS+=	CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
 .include "../../mk/bsd.prefs.mk"
 
 # The default location is /etc/default/star
-# We patch the documentation appropriately. Additionally, we also provide a
-# MESSAGE stating the reasons we do this, as required by the license.
+# We patch the documentation appropriately. Additionally, we also install
+# INSTALL.pkgsrc stating the reasons we do this, as required by the license.
 STAR_CONF?=	${PKG_SYSCONFDIR}/star
 
-.if ${STAR_CONF} != "/etc/default/star"
-MESSAGE_SRC+=	MESSAGE.star
-MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV}
-MESSAGE_SUBST+=	STAR_CONF=${STAR_CONF:Q}
-.endif
-
 CONF_FILES=	${PREFIX}/share/examples/star/star ${STAR_CONF}
 AUTO_MKDIRS=	yes
 
+# Configure config file location
 SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix+=	star/star.1
@@ -44,10 +40,19 @@ SUBST_FILES.fix+=	star/defaults.c
 SUBST_SED.fix=		-e "s,/etc/default/star,${STAR_CONF},g"
 SUBST_MESSAGE.fix=	Replace defaults file paths.
 
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+SUBST_CLASSES+=		install
+SUBST_STAGE.install=	post-configure
+SUBST_MESSAGE.install=	Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install=	${WRKDIR}/INSTALL.pkgsrc
+SUBST_SED.install=	-e 's,PKGNAME_NOREV,${PKGNAME_NOREV},'
+SUBST_SED.install+=	-e 's,STAR_CONF,${STAR_CONF:Q},'
+
 # Shared platform specific code for schilytools (provided by smake package)
 .include "../../devel/smake/Makefile.common"
 
 do-configure:
+	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
 	cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
 
 do-build:
@@ -76,5 +81,7 @@ do-install:
 	cd ${WRKSRC}/star && ${SMAKE} ${MAKE_FLAGS} install
 	${INSTALL_DATA} ${WRKSRC}/star/star.dfl				\
 		${DESTDIR}${PREFIX}/share/examples/star/star
+	${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc			\
+		${DESTDIR}${PREFIX}/share/doc/star/INSTALL.pkgsrc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/star/PLIST b/star/PLIST
index 167e8c3c66..a5f4657e2e 100644
--- a/star/PLIST
+++ b/star/PLIST
@@ -13,6 +13,7 @@ man/man1/star.1
 man/man1/suntar.1
 man/man1/ustar.1
 man/man5/star.5
+share/doc/star/INSTALL.pkgsrc
 share/doc/star/README
 share/doc/star/README.ACL
 share/doc/star/README.crash
diff --git a/star/distinfo b/star/distinfo
index ea93ab4062..39f3631886 100644
--- a/star/distinfo
+++ b/star/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (schily-2019-08-13.tar.bz2) = 2eae2dea47ce9101942ca7e425cd523bddf515fa
-RMD160 (schily-2019-08-13.tar.bz2) = df65883a857790f902406b6bf07fb75ba530e8eb
-SHA512 (schily-2019-08-13.tar.bz2) = e69ed060aa5b5203b8af20834b9cceb0c4dc7be20b8d43d781c056f974ba67337415f512575461ee16504e6162311fc84fca9b83ae240c4102d2cfe95bfa9cd7
-Size (schily-2019-08-13.tar.bz2) = 4447359 bytes
+SHA1 (schily-2019-09-22.tar.bz2) = 5ab0f574cca9f89a225948b3df2918fccc7f06e2
+RMD160 (schily-2019-09-22.tar.bz2) = 70fb7b2b66e85cac7cd94bb6ef92b5ed1cdce2c0
+SHA512 (schily-2019-09-22.tar.bz2) = 83eecb7644ca720a3b1cae69481202a83ff8bf602bf6c0f8bab96f58402adc53fe142802c0d725c63f5109ec4875d99e8f93842fed7efa77d3e23c5cfc97d9e3
+Size (schily-2019-09-22.tar.bz2) = 4460891 bytes
diff --git a/star/files/INSTALL.pkgsrc b/star/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..db88cf0a06
--- /dev/null
+++ b/star/files/INSTALL.pkgsrc
@@ -0,0 +1,9 @@
+The location of the PKGNAME_NOREV `defaults' file has been set to:
+
+   STAR_CONF
+
+This is the pkgsrc standard config file location, NOT the PKGNAME_NOREV
+standard location, which is /etc/default/star.
+
+The reason for this is that pkgsrc packages should not use configuration
+files outside ${LOCALBASE} unless they are explicitly set by the user.
Home | Main Index | Thread Index | Old Index