pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

star: Installation updated and configfile handling added



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Sep 28 18:58:36 2018 +0200
Changeset:	d80ef577f741501a13781acc10464cb4687605a6

Modified Files:
	star/Makefile
	star/PLIST
	star/TODO

Log Message:
star: Installation updated and configfile handling added

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

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

diffstat:
 star/Makefile | 32 ++++++++++++++++++++------------
 star/PLIST    |  1 +
 star/TODO     |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diffs:
diff --git a/star/Makefile b/star/Makefile
index cf717a2a66..5ea1242caf 100644
--- a/star/Makefile
+++ b/star/Makefile
@@ -16,6 +16,12 @@ MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	tbl
 TOOL_DEPENDS+=	smake-[0-9]*:../../wip/smake
 SMAKE=		MAKEFLAGS= smake
+MAKE_FLAGS+=	DESTDIR=${DESTDIR} INS_BASE=${PREFIX} DEFMANBASE=. MANDIR=${PKGMANDIR}
+
+# This creates strange "shift: can't shift that many" errors
+#MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/default/star 0755
+CONF_FILES=	${PREFIX}/share/examples/star/star ${PKG_SYSCONFDIR}/default/star
+AUTO_MKDIRS=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,30 +29,32 @@ SMAKE=		MAKEFLAGS= smake
 .include "../../wip/smake/Makefile.common"
 
 do-configure:
-	cd ${WRKSRC}/inc && ${SMAKE}
+	cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
 
 do-build:
 	cd ${WRKSRC} && for library in					\
 		libschily libdeflt libfind librmt;			\
 	do								\
-		cd ${WRKSRC}/$${library} && ${SMAKE};			\
+		cd ${WRKSRC}/$${library} && ${SMAKE} ${MAKE_FLAGS};	\
 	done
-	cd ${WRKSRC}/star && ${SMAKE}
+	cd ${WRKSRC}/star && ${SMAKE} ${MAKE_FLAGS}
 
 # Process tables in manpage
 post-build:
-	cd ${WRKSRC} && ${TBL} star/spax.1 >star/spax.1.tmp &&		\
-		${MV} -f star/spax.1.tmp star/spax.1
-	cd ${WRKSRC} && ${TBL} star/star.4 >star/star.4.tmp &&		\
-		${MV} -f star/star.4.tmp star/star.4
+	cd ${WRKSRC} && if ! ${TEST} -f star/pkgsrc_tbl.done; then	\
+		${TBL} star/spax.1 >star/spax.1.tmp &&			\
+		${MV} -f star/spax.1.tmp star/spax.1 &&			\
+		${TBL} star/star.4 >star/star.4.tmp &&			\
+		${MV} -f star/star.4.tmp star/star.4 &&			\
+		${TOUCH} star/pkgsrc_tbl.done;				\
+	fi
 
 do-test:
-	cd ${WRKSRC}/star &&						\
-		cd tests; ${SMAKE} tests
+	cd ${WRKSRC}/star && cd tests ; ${SMAKE} ${MAKE_FLAGS} tests
 
-# Documentation is in ${WRKSRC}/README.compile
 do-install:
-	cd ${WRKSRC}/star && ${SMAKE}					\
-		INS_BASE=${PREFIX} DEFMANBASE=. DESTDIR=${DESTDIR} install
+	cd ${WRKSRC}/star && ${SMAKE} ${MAKE_FLAGS} install
+	${INSTALL_DATA} ${WRKSRC}/star/star.dfl				\
+		${DESTDIR}${PREFIX}/share/examples/star/star
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/star/PLIST b/star/PLIST
index ef5209aa61..36be1da4ec 100644
--- a/star/PLIST
+++ b/star/PLIST
@@ -59,3 +59,4 @@ share/doc/star/testscripts/ustar-bad-filetypes.tar
 share/doc/star/testscripts/ustar-bad-signedsum.tar
 share/doc/star/testscripts/ustar-big-2g.tar.bz2
 share/doc/star/testscripts/ustar-big-8g.tar.bz2
+share/examples/star/star
diff --git a/star/TODO b/star/TODO
index 9dddcce5b8..947706fb1e 100644
--- a/star/TODO
+++ b/star/TODO
@@ -1,2 +1,3 @@
 [X] Compilation works
 [X] Installation rule and PLIST
+[ ] MAKE_DIRS_PERMS doesn't work


Home | Main Index | Thread Index | Old Index