Hi Yann, Am 12.11.2012 um 22:51 schrieb chnin...@users.sourceforge.net:
> Revision: 19678 > http://gar.svn.sourceforge.net/gar/?rev=19678&view=rev > Author: chninkel > Date: 2012-11-12 21:51:10 +0000 (Mon, 12 Nov 2012) > Log Message: > ----------- > fortune/trunk: updated recipe to build package from gar > > Added Paths: > ----------- > csw/mgar/pkg/fortune/trunk/Makefile > csw/mgar/pkg/fortune/trunk/checksums > csw/mgar/pkg/fortune/trunk/files/ > csw/mgar/pkg/fortune/trunk/files/0001-use-ginstall.patch > csw/mgar/pkg/fortune/trunk/files/changelog.CSW > csw/mgar/pkg/fortune/trunk/files/license > > Added: csw/mgar/pkg/fortune/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/fortune/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/fortune/trunk/Makefile 2012-11-12 21:51:10 UTC (rev > 19678) > @@ -0,0 +1,80 @@ > +##################################################################### > +# OpenCSW build recipe for fortune > +# > +# Author: Yann Rouillard <y...@pleiades.fr.eu.org> > +# > +# Redistribution and/or use, with or without modification, is > +# permitted. This software is without warranty of any kind. The > +# author(s) shall not be liable in the event that use of the > +# software causes damage. > +##################################################################### > + > +###### Package information ####### > + > +NAME = fortune > +VERSION = 9708 > +CATEGORIES = utils > +GARTYPE = v2 > + > +DESCRIPTION = Provides fortune cookies on demand > +define BLURB > + Provides fortune cookies on demand > +endef > + > +MASTER_SITES = http://www.ibiblio.org/pub/Linux/games/amusements/fortune/ > +UPSTREAM_MASTER = ftp://ftp.ibiblio.org/pub/linux/games/amusements/fortune/ > + > +PACKAGES = CSWfortune > + > +###### Upstream and opencsw files information ####### > + > +DISTNAME = fortune-mod-$(VERSION) > +DISTFILES = $(DISTNAME).tar.gz > +DISTFILES += changelog.CSW > +DISTFILES += license If you name it COPYING you don't need further tweaking as it is the default name for the license and DISTFILES are delivered to WORKDIR automatically. > + > +PATCHFILES = 0001-use-ginstall.patch > +#PATCHFILES += 0002-Honor-DESTDIR.patch > + > +DOCFILES = INSTALL Notes Offensive README TODO > + > + > +##### Build and installation information ##### > + > + > +GARCOMPILER = SUN > + > +CONFIGURE_ARGS = $(DIRPATHS) > + > +CONFIGURE_SCRIPTS = > +TEST_SCRIPTS = > + > +BUILD_OVERRIDE_VARS = COOKIEDIR > +BUILD_OVERRIDE_VAR_COOKIEDIR = $(sharedstatedir)/fortunes > + > +INSTALL_OVERRIDE_VARS = FORTDIR BINDIR FORTMANDIR BINMANDIR COOKIEDIR > +INSTALL_OVERRIDE_VAR_FORTDIR = $(DESTDIR)/$(sharedstatedir)/fortunes > +INSTALL_OVERRIDE_VAR_FORTMANDIR = $(DESTDIR)/$(mandir)/man6 > +INSTALL_OVERRIDE_VAR_BINDIR = $(DESTDIR)/$(bindir)/ > +INSTALL_OVERRIDE_VAR_BINMANDIR = $(DESTDIR)/$(mandir)/man1 > +INSTALL_OVERRIDE_VAR_COOKIEDIR = $(DESTDIR)/$(sharedstatedir)/fortunes > + > +REINPLACE_MATCH = /usr/local/share/games > +REINPLACE_WITH = /opt/csw/share > +REINPLACE_FILES += Notes > + > +include gar/category.mk > + > +mv-fortune: > + [ -f "$(PKGROOT)/$(bindir)/fortune" ] || \ > + mv "$(PKGROOT)/$(sharedstatedir)/fortunes/fortune" > "$(PKGROOT)/$(bindir)"/ This could probably better be done with a merge modified renaming files during merge. However, the integration is ATM quite ugly, so this is probably ok. > + > +merge-doc: > + ginstall -d $(PKGROOT)/$(docdir)/$(NAME) > + cd $(DOWNLOADDIR)/ && ginstall -m 0644 license changelog.CSW > $(PKGROOT)/$(docdir)/$(NAME)/ > + cd $(WORKSRC_FIRSTMOD)/ && ginstall -m 0644 $(DOCFILES) > $(PKGROOT)/$(docdir)/$(NAME)/ Please do not install during merge as WORKSRC_FIRSTMOD will be deleted soon as the files are in global already. The operation is a typical post-install. > + @$(MAKECOOKIE) Using MAKECOOKIE on non-standard rules is dangerous as they are not removed when redoing a phase. I suggest moving it to post-merge. > + > +post-merge: mv-fortune merge-doc > + > + > > Added: csw/mgar/pkg/fortune/trunk/checksums > =================================================================== > --- csw/mgar/pkg/fortune/trunk/checksums (rev 0) > +++ csw/mgar/pkg/fortune/trunk/checksums 2012-11-12 21:51:10 UTC (rev > 19678) > @@ -0,0 +1 @@ > +81a87a44f9d94b0809dfc2b7b140a379 fortune-mod-9708.tar.gz > > Added: csw/mgar/pkg/fortune/trunk/files/0001-use-ginstall.patch > =================================================================== > --- csw/mgar/pkg/fortune/trunk/files/0001-use-ginstall.patch > (rev 0) > +++ csw/mgar/pkg/fortune/trunk/files/0001-use-ginstall.patch 2012-11-12 > 21:51:10 UTC (rev 19678) > @@ -0,0 +1,107 @@ > +From 446dee106ed9cd4fc3785e216d14e3907787ef94 Mon Sep 17 00:00:00 2001 > +From: Yann Rouillard <y...@pleiades.fr.eu.org> > +Date: Sun, 11 Nov 2012 02:45:46 +0100 > +Subject: [PATCH] use ginstall > + > +--- > + Makefile | 18 +++++++++--------- > + datfiles/Makefile | 4 ++-- > + datfiles/html/Makefile | 4 ++-- > + datfiles/off/Makefile | 4 ++-- > + 4 files changed, 15 insertions(+), 15 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index 6017155..dec8c21 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -128,14 +128,14 @@ install: install-fortune install-util install-man > install-cookie > + > + # Install just the fortune program > + install-fortune: fortune-bin > +- install -m 0755 -d $(FORTDIR) > +- install -m 0755 fortune/fortune $(FORTDIR) > ++ ginstall -m 0755 -d $(FORTDIR) > ++ ginstall -m 0755 fortune/fortune $(FORTDIR) You could easily achieve this without patching with INSTALL_ENV_PATH = $(prefix)/gnu:$(PATH) > + > + # Install just the utilities strfile and unstr > + install-util: util-bin > +- install -m 0755 -d $(BINDIR) > +- install -m $(BINMODE) util/strfile $(BINDIR) > +- install -m $(BINMODE) util/unstr $(BINDIR) > ++ ginstall -m 0755 -d $(BINDIR) > ++ ginstall -m $(BINMODE) util/strfile $(BINDIR) > ++ ginstall -m $(BINMODE) util/unstr $(BINDIR) > + > + # Install all the man pages > + install-man: install-fman install-uman > +@@ -155,13 +155,13 @@ fortune/fortune.man: fortune/fortune-man.part1 > fortune/fortune-man.part2 > + > + # Install the fortune man pages > + install-fman: fortune/fortune.man > +- install -m 0755 -d $(FORTMANDIR) > +- install -m 0644 fortune/fortune.man $(FORTMANDIR)/fortune.$(FORTMANEXT) > ++ ginstall -m 0755 -d $(FORTMANDIR) > ++ ginstall -m 0644 fortune/fortune.man $(FORTMANDIR)/fortune.$(FORTMANEXT) > + > + # Install the utilities man pages > + install-uman: > +- install -m 0755 -d $(BINMANDIR) > +- install -m 0644 util/strfile.man $(BINMANDIR)/strfile.$(BINMANEXT) > ++ ginstall -m 0755 -d $(BINMANDIR) > ++ ginstall -m 0644 util/strfile.man $(BINMANDIR)/strfile.$(BINMANEXT) > + rm -f $(BINMANDIR)/unstr.$(BINMANEXT) > + ln -s strfile.$(BINMANEXT) $(BINMANDIR)/unstr.$(BINMANEXT) > + > +diff --git a/datfiles/Makefile b/datfiles/Makefile > +index e753cb0..2eac583 100644 > +--- a/datfiles/Makefile > ++++ b/datfiles/Makefile > +@@ -27,11 +27,11 @@ cookies-stamp: > + touch cookies-stamp > + > + install: cookies-stamp > +- install -m 0755 -d $(COOKIEDIR) > ++ ginstall -m 0755 -d $(COOKIEDIR) > + if [ $(OFFENSIVE) = 1 ] ; then cd off && $(MAKE) install ; fi > + if [ $(WEB) = 1 ] ; then cd html && $(MAKE) install ; fi > + for i in $(COOKIES) ; do \ > +- install -m 0644 $$i $$i.dat $(COOKIEDIR) || exit $? ; done > ++ ginstall -m 0644 $$i $$i.dat $(COOKIEDIR) || exit $? ; done > + > + clean: > + rm -f cookies-stamp *.dat > +diff --git a/datfiles/html/Makefile b/datfiles/html/Makefile > +index 04c9408..84ae47b 100644 > +--- a/datfiles/html/Makefile > ++++ b/datfiles/html/Makefile > +@@ -12,9 +12,9 @@ wcookies-stamp: > + touch cookies-stamp > + > + install: wcookies-stamp > +- install -m 0755 -d $(WCOOKIEDIR) > ++ ginstall -m 0755 -d $(WCOOKIEDIR) > + for i in $(WCOOKIES) ; do \ > +- install -m 0644 $$i $$i.dat $(WCOOKIEDIR) || exit $$? ; done > ++ ginstall -m 0644 $$i $$i.dat $(WCOOKIEDIR) || exit $$? ; done > + > + clean: > + rm -f wcookies-stamp *.dat > +diff --git a/datfiles/off/Makefile b/datfiles/off/Makefile > +index d83ee0d..1089770 100644 > +--- a/datfiles/off/Makefile > ++++ b/datfiles/off/Makefile > +@@ -24,9 +24,9 @@ rotated-stamp: > + touch rotated-stamp > + > + install: > +- install -m 0755 -d $(OCOOKIEDIR) > ++ ginstall -m 0755 -d $(OCOOKIEDIR) > + for i in $(OCOOKIES) ; \ > +- do install -m 0644 $$i $$i.dat $(OCOOKIEDIR) || exit $$? ; done > ++ do ginstall -m 0644 $$i $$i.dat $(OCOOKIEDIR) || exit $$? ; done > + > + clean: > + rm -f ocookies-stamp rotated-stamp *.dat $(OCOOKIES_UNROTATED) > +-- > +1.8.0 > + > > Added: csw/mgar/pkg/fortune/trunk/files/changelog.CSW > =================================================================== > Added: csw/mgar/pkg/fortune/trunk/files/license > =================================================================== > --- csw/mgar/pkg/fortune/trunk/files/license (rev 0) > +++ csw/mgar/pkg/fortune/trunk/files/license 2012-11-12 21:51:10 UTC (rev > 19678) > @@ -0,0 +1,68 @@ > + > +Copyright (c) 1986, 1993 > +The Regents of the University of California. All rights reserved. > + * > +This code is derived from software contributed to Berkeley by > +Ken Arnold. > + * > +Redistribution and use in source and binary forms, with or without > +modification, are permitted provided that the following conditions > +are met: > +1. Redistributions of source code must retain the above copyright > + notice, this list of conditions and the following disclaimer. > +2. Redistributions in binary form must reproduce the above copyright > + notice, this list of conditions and the following disclaimer in the > + documentation and/or other materials provided with the distribution. > +3. All advertising materials mentioning features or use of this software > + must display the following acknowledgement: > +This product includes software developed by the University of > +California, Berkeley and its contributors. > +4. Neither the name of the University nor the names of its contributors > + may be used to endorse or promote products derived from this software > + without specific prior written permission. > + * > +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > +SUCH DAMAGE. > + > + > +Modified September, 1995, Amy A. Lewis > +1: removed all file-locking dreck. Unnecessary > +2: Fixed bug that made fortune -f report a different list than > + fortune with any other parameters, or none, and which forced > + the program to read only one file (named 'fortunes') > +3: removed the unnecessary print_file_list() > +4: Added "OFFDIR" to pathnames.h as the directory in which offensive > + fortunes are kept. This considerably simplifies our life by > + permitting us to dispense with a lot of silly tests for the string > + "-o" at the end of a filename. > +5: I think the problems with trying to find filenames were fixed by > + the change in the way that offensive files are defined. Two birds, > + one stone! > +6: Calculated probabilities for all files, so that -f will print them. > + > + > +Changes Copyright (c) 1997 Dennis L. Clark. All rights reserved. > + * > + The changes in this file may be freely redistributed, modified or > + included in other software, as long as both the above copyright > + notice and these conditions appear intact. > + > + > +Modified May 1997, Dennis L. Clark (dbug...@progsoc.uts.edu.au) > + + Various portability fixes > + + Percent selection of files with -a now works on datafiles which > + appear in both unoffensive and offensive directories (see man page > + for details) > + + The -s and -l options are now more consistant in their > + interpretation of fortune length > + + The -s and -l options can now be combined wit the -m option > + > > This was sent by the SourceForge.net collaborative development platform, the > world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel@lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
