[SM-Commit] PERFORCE change 79652 by Flavien Bridault for review

Perforce Review Daemon p4review at smee.org
Mon May 22 06:05:01 EDT 2006


Change 79652 by flavien_bridault at flavien-Gargamel on 2006/05/22 11:01:01

	integrate bugfix 11894 from devel

Affected files ...

... //sgl/grimoires/test/graphics/fontforge/DETAILS#13 integrate
... //sgl/grimoires/test/graphics/fontforge/HISTORY#14 integrate
... //sgl/grimoires/test/graphics/fontforge/INSTALL#2 delete
... //sgl/grimoires/test/graphics/fontforge/PREPARE#1 branch
... //sgl/grimoires/test/graphics/fontforge/PRE_BUILD#2 integrate

Differences ...

==== //sgl/grimoires/test/graphics/fontforge/DETAILS#13 (xtext) ====

@@ -1,20 +1,19 @@
            SPELL=fontforge
          VERSION=20060413
-    DOCS_VERSION=20060406
           SOURCE=${SPELL}_full-$VERSION.tar.bz2
-         SOURCE2=${SPELL}_htdocs-$DOCS_VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+if [ $INSTALL_DOCS = 'y' ]; then
+    DOCS_VERSION=20060406
+         SOURCE2=${SPELL}_htdocs-$DOCS_VERSION.tar.bz2
   SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
      SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
-     #SOURCE_HASH=sha512:4a4be69e6c1f97fc3f325f06df66f3c9671e8d7d8e3c352a3b30c7caf0165b1309b2ee56509c90c05d280f864b518da684afd936feb86f165e25af4c89e28dcf
-    #SOURCE2_HASH=sha512:2cae3596ab15f2e893107377f5e43805d0cfe80cad4bd159a6f2f290a8505ff411e55ae50e026cc687f7189a5bfc94f533b74daab073d05884ee7427fec684e8
+fi
       LICENSE[0]=BSD
         KEYWORDS="fonts graphics editors"
         WEB_SITE=http://fontforge.sourceforge.net
          ENTERED=20030628
-         UPDATED=20030628
            SHORT="An outline font editor"
 cat << EOF
 FontForge -- An outline font editor that lets you create your own postscript,

==== //sgl/grimoires/test/graphics/fontforge/HISTORY#14 (text) ====

@@ -1,3 +1,9 @@
+2006-05-22 Flavien Bridault <vlaaad at sourcemage.org>
+	* PREPARE: added to prompt for documentation installing
+	* PRE_BUILD, DETAILS: made documentation optional,
+	* INSTALL: removed, wrong unpack call (bug #11894) and Makefile anyway
+	  takes care of installing the docs if the dir ./htdocs is present
+ 
 2006-04-23 Pol Vinogradov <vin.public at gmail.com>
 	* fontforge_full-20060413.tar.bz2.sig: changed because of tarball
 

==== //sgl/grimoires/test/graphics/fontforge/PRE_BUILD#2 (xtext) ====

@@ -1,4 +1,6 @@
 default_pre_build                 &&
-mkdir  $SOURCE_DIRECTORY/source2  &&
-cd  $SOURCE_DIRECTORY/source2     &&
-unpack_file  '2'
+if [ $INSTALL_DOCS = 'y' ]; then
+  mkdir  $SOURCE_DIRECTORY/htdocs   &&
+  cd  $SOURCE_DIRECTORY/htdocs      &&
+  unpack_file  '2'
+fi



More information about the SM-Commit mailing list