Date: Tue, 15 Jul 2014 12:50:29 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361915 - in head/misc/brs: . files Message-ID: <201407151250.s6FCoTvK049628@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Tue Jul 15 12:50:28 2014 New Revision: 361915 URL: http://svnweb.freebsd.org/changeset/ports/361915 QAT: https://qat.redports.org/buildarchive/r361915/ Log: 1: Stagify. 2: USES=tar:bzip2 Approved by: portmgr@ (blanket) Modified: head/misc/brs/Makefile head/misc/brs/files/patch-aa head/misc/brs/pkg-plist Modified: head/misc/brs/Makefile ============================================================================== --- head/misc/brs/Makefile Tue Jul 15 12:46:58 2014 (r361914) +++ head/misc/brs/Makefile Tue Jul 15 12:50:28 2014 (r361915) @@ -11,13 +11,11 @@ DIST_SUBDIR= brs MAINTAINER= user@unknown.nu COMMENT= Interactive King James Bible -USE_BZIP2= yes +USES= tar:bzip2 NO_WRKSUBDIR= yes ALL_TARGET= CFLAGS+= -Wno-error=return-type -MAN1= bible.1 -NO_STAGE= yes post-patch: ${REINPLACE_CMD} 's=%%PREFIX%%=${PREFIX}=g' \ ${WRKSRC}/brl.c ${WRKSRC}/bible.1 Modified: head/misc/brs/files/patch-aa ============================================================================== --- head/misc/brs/files/patch-aa Tue Jul 15 12:46:58 2014 (r361914) +++ head/misc/brs/files/patch-aa Tue Jul 15 12:50:28 2014 (r361915) @@ -1,135 +1,120 @@ -*** Makefile.orig Wed Aug 9 18:49:09 1995 ---- Makefile Thu Jul 10 22:40:43 2003 -*************** -*** 177,185 **** - # primary man page - MAN = $(PROGRAM).1 - -- # raw data file -- RAWDATA = $(PROGRAM).rawtext -- - # Derived data file. Comes from processing raw data file. - DATA = $(PROGRAM).data - ---- 177,182 ---- -*************** -*** 187,198 **** - NINSTPKG = $(PROGRAM).pkg - - # where to install this stuff -! DEST = /usr/local - #DEST = $(HOME)/local - DESTBIN = $(DEST)/bin -! DESTLIB = $(DEST)/lib - DESTMAN = $(DEST)/man -! DESTMAN1 = $(DESTMAN)/man1.Z - - # release directories. Nobody should care about this but me - FTPHOME = /mnt/ftp ---- 184,195 ---- - NINSTPKG = $(PROGRAM).pkg - - # where to install this stuff -! DEST = $(PREFIX) - #DEST = $(HOME)/local - DESTBIN = $(DEST)/bin -! DESTLIB = $(DEST)/share/brs - DESTMAN = $(DEST)/man -! DESTMAN1 = $(DESTMAN)/man1 - - # release directories. Nobody should care about this but me - FTPHOME = /mnt/ftp -*************** -*** 349,358 **** - else rm squish.tmpdata squish.stats; fi - - -- $(PROGINDEX).c: $(RAWDATA) -- make makeindex -- ./makeindex $(RAWDATA) > $@ -- - $(DATA): squish.stats squish.data - make buildcmp - ./buildcmp ---- 346,351 ---- -*************** -*** 366,384 **** - # Note that $(PROGINDEX).c is included in source distributions, while - # $(RAWDATA) is NOT included in all distributions. $(PROGINDEX).c does NOT - # need to be rebuilt unless someone (probably me) has munged $(RAWDATA). -- SAFEDATE = 0101000193 -- $(RAWDATA): -- @touch $(SAFEDATE) $@ -- @if [ -r $(SAFEDATE) ]; then \ -- /bin/rm $(SAFEDATE) $@; \ -- if [ -x /usr/5bin/touch ]; then \ -- /usr/5bin/touch $(SAFEDATE) $@; \ -- else \ -- # major kludge alert! ... \ -- touch brl-startverse.h brl-startchapter.h $(PROGINDEX).c; \ -- fi; \ -- fi -- @echo " A dummy $(RAWDATA) file has been created." - - # The dependency on $(RAWDATA) helps to ensure that the raw concordance file - # is not rebuilt unnecessarily. ---- 359,364 ---- -*************** -*** 392,401 **** - ./makeconc.pl - # ./makeconcordance - -- $(MAN).Z: $(MAN) -- /bin/rm $@ -- compress < $(MAN) > $(MAN).Z -- - clean:; @rm -f $(PROGOBJS) $(TOOLOBJS) core - - clobber:; @rm -f $(PROGOBJS) $(TOOLOBJS) $(PROGRAM) $(TOOLS) $(DATA) \ ---- 372,377 ---- -*************** -*** 543,565 **** - @if [ $(DESTBIN) != . ]; then \ - ((cd $(DESTBIN);rm -f $(PROGRAM)); \ - cp $(PROGRAM) $(DESTBIN)); \ -! chown bin $(DESTBIN)/$(PROGRAM); \ -! chgrp bin $(DESTBIN)/$(PROGRAM); \ - chmod 755 $(DESTBIN)/$(PROGRAM); fi - @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB) - @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi - @if [ $(DESTLIB) != . ]; then \ - cp $(DATA) $(DATA).conc $(DESTLIB); \ -! chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ -! chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ - chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi - @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi - @echo Installing $(MAN) in $(DESTMAN1) - @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi - @if [ $(DESTMAN1) != . ]; then \ -! cp $(MAN).Z $(DESTMAN1)/$(MAN); \ -! chown bin $(DESTMAN1)/$(MAN); \ -! chgrp bin $(DESTMAN1)/$(MAN); \ - chmod 644 $(DESTMAN1)/$(MAN); fi - - uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN) ---- 519,538 ---- - @if [ $(DESTBIN) != . ]; then \ - ((cd $(DESTBIN);rm -f $(PROGRAM)); \ - cp $(PROGRAM) $(DESTBIN)); \ -! chown root:wheel $(DESTBIN)/$(PROGRAM); \ - chmod 755 $(DESTBIN)/$(PROGRAM); fi - @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB) - @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi - @if [ $(DESTLIB) != . ]; then \ - cp $(DATA) $(DATA).conc $(DESTLIB); \ -! chown root:wheel $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ - chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi - @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi - @echo Installing $(MAN) in $(DESTMAN1) - @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi - @if [ $(DESTMAN1) != . ]; then \ -! cp $(MAN) $(DESTMAN1)/$(MAN); \ -! chown root:wheel $(DESTMAN1)/$(MAN); \ - chmod 644 $(DESTMAN1)/$(MAN); fi - - uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN) +--- Makefile.orig 1995-08-10 07:49:09.000000000 +0800 ++++ Makefile 2014-07-15 20:46:53.626067731 +0800 +@@ -177,9 +177,6 @@ README = README.$(PROGRAM) + # primary man page + MAN = $(PROGRAM).1 + +-# raw data file +-RAWDATA = $(PROGRAM).rawtext +- + # Derived data file. Comes from processing raw data file. + DATA = $(PROGRAM).data + +@@ -187,12 +184,12 @@ DATA = $(PROGRAM).data + NINSTPKG = $(PROGRAM).pkg + + # where to install this stuff +-DEST = /usr/local ++DEST = $(PREFIX) + #DEST = $(HOME)/local + DESTBIN = $(DEST)/bin +-DESTLIB = $(DEST)/lib ++DESTLIB = $(DEST)/share/brs + DESTMAN = $(DEST)/man +-DESTMAN1 = $(DESTMAN)/man1.Z ++DESTMAN1 = $(DESTMAN)/man1 + + # release directories. Nobody should care about this but me + FTPHOME = /mnt/ftp +@@ -349,10 +346,6 @@ squish.stats squish.data: $(RAWDATA) + else rm squish.tmpdata squish.stats; fi + + +-$(PROGINDEX).c: $(RAWDATA) +- make makeindex +- ./makeindex $(RAWDATA) > $@ +- + $(DATA): squish.stats squish.data + make buildcmp + ./buildcmp +@@ -366,19 +359,6 @@ $(DATA): squish.stats squish.data + # Note that $(PROGINDEX).c is included in source distributions, while + # $(RAWDATA) is NOT included in all distributions. $(PROGINDEX).c does NOT + # need to be rebuilt unless someone (probably me) has munged $(RAWDATA). +-SAFEDATE = 0101000193 +-$(RAWDATA): +- @touch $(SAFEDATE) $@ +- @if [ -r $(SAFEDATE) ]; then \ +- /bin/rm $(SAFEDATE) $@; \ +- if [ -x /usr/5bin/touch ]; then \ +- /usr/5bin/touch $(SAFEDATE) $@; \ +- else \ +- # major kludge alert! ... \ +- touch brl-startverse.h brl-startchapter.h $(PROGINDEX).c; \ +- fi; \ +- fi +- @echo " A dummy $(RAWDATA) file has been created." + + # The dependency on $(RAWDATA) helps to ensure that the raw concordance file + # is not rebuilt unnecessarily. +@@ -392,10 +372,6 @@ $(PROGRAM).rawconcordance: $(RAWDATA) + ./makeconc.pl + # ./makeconcordance + +-$(MAN).Z: $(MAN) +- /bin/rm $@ +- compress < $(MAN) > $(MAN).Z +- + clean:; @rm -f $(PROGOBJS) $(TOOLOBJS) core + + clobber:; @rm -f $(PROGOBJS) $(TOOLOBJS) $(PROGRAM) $(TOOLS) $(DATA) \ +@@ -536,31 +512,28 @@ ninstall: $(NINSTPKG) + # The "install" target could be of general use. That's why there are + # no explicit dependencies here. They just confuse things... + install: +- @if [ ! -r $(DEST) ]; then mkdir $(DEST); fi ++ @if [ ! -r $(DESTDIR)$(DEST) ]; then mkdir $(DESTDIR)$(DEST); fi + @echo Installing $(PROGRAM) in $(DESTBIN) + @-strip $(PROGRAM) +- @if [ ! -r $(DESTBIN) ]; then mkdir $(DESTBIN); fi +- @if [ $(DESTBIN) != . ]; then \ +- ((cd $(DESTBIN);rm -f $(PROGRAM)); \ +- cp $(PROGRAM) $(DESTBIN)); \ +- chown bin $(DESTBIN)/$(PROGRAM); \ +- chgrp bin $(DESTBIN)/$(PROGRAM); \ +- chmod 755 $(DESTBIN)/$(PROGRAM); fi ++ @if [ ! -r $(DESTDIR)$(DESTBIN) ]; then mkdir $(DESTDIR)$(DESTBIN); fi ++ @if [ $(DESTDIR)$(DESTBIN) != . ]; then \ ++ ((cd $(DESTDIR)$(DESTBIN);rm -f $(PROGRAM)); \ ++ cp $(PROGRAM) $(DESTDIR)$(DESTBIN)); \ ++ chown root:wheel $(DESTDIR)$(DESTBIN)/$(PROGRAM); \ ++ chmod 755 $(DESTDIR)$(DESTBIN)/$(PROGRAM); fi + @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB) +- @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi +- @if [ $(DESTLIB) != . ]; then \ +- cp $(DATA) $(DATA).conc $(DESTLIB); \ +- chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ +- chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ +- chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi +- @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi ++ @if [ ! -r $(DESTDIR)$(DESTLIB) ]; then mkdir $(DESTDIR)$(DESTLIB); fi ++ @if [ $(DESTDIR)$(DESTLIB) != . ]; then \ ++ cp $(DATA) $(DATA).conc $(DESTDIR)$(DESTLIB); \ ++ chown root:wheel $(DESTDIR)$(DESTLIB)/$(DATA) $(DESTDIR)$(DESTLIB)/$(DATA).conc; \ ++ chmod 644 $(DESTDIR)$(DESTLIB)/$(DATA) $(DESTDIR)$(DESTLIB)/$(DATA).conc; fi ++ @if [ ! -r $(DESTDIR)$(DESTMAN) ]; then mkdir $(DESTDIR)$(DESTMAN); fi + @echo Installing $(MAN) in $(DESTMAN1) +- @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi +- @if [ $(DESTMAN1) != . ]; then \ +- cp $(MAN).Z $(DESTMAN1)/$(MAN); \ +- chown bin $(DESTMAN1)/$(MAN); \ +- chgrp bin $(DESTMAN1)/$(MAN); \ +- chmod 644 $(DESTMAN1)/$(MAN); fi ++ @if [ ! -r $(DESTDIR)$(DESTMAN1) ]; then mkdir $(DESTDIR)$(DESTMAN1); fi ++ @if [ $(DESTDIR)$(DESTMAN1) != . ]; then \ ++ cp $(MAN) $(DESTDIR)$(DESTMAN1)/$(MAN); \ ++ chown root:wheel $(DESTDIR)$(DESTMAN1)/$(MAN); \ ++ chmod 644 $(DESTDIR)$(DESTMAN1)/$(MAN); fi + + uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN) + rm -f $(DESTBIN)/$(PROGRAM) Modified: head/misc/brs/pkg-plist ============================================================================== --- head/misc/brs/pkg-plist Tue Jul 15 12:46:58 2014 (r361914) +++ head/misc/brs/pkg-plist Tue Jul 15 12:50:28 2014 (r361915) @@ -1,4 +1,5 @@ bin/bible +man/man1/bible.1.gz %%DATADIR%%/bible.data %%DATADIR%%/bible.data.conc @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407151250.s6FCoTvK049628>