Allow license files to use different symbols for comments

var/spack/repos/builtin/packages/nag/package.py

@@ -5,17 +5,26 @@ class Nag(Package):
     """The NAG Fortran Compiler."""
     homepage = "http://www.nag.com/nagware/np.asp"
 
-    version('6.1', '1e29d9d435b7ccc2842a320150b28ba4',
-            url='http://www.nag.com/downloads/impl/npl6a61na_amd64.tgz')
+    version('6.1', '1e29d9d435b7ccc2842a320150b28ba4')
+    version('6.0', '3fa1e7f7b51ef8a23e6c687cdcad9f96')
 
     # Licensing
     license_required = True
+    license_comment  = '!'
     license_files    = ['lib/nag.key',
                         'lib/nag.licence',
                         'lib/nagware.licence']
     license_vars     = ['NAG_KUSARI_FILE']
     license_url      = 'http://www.nag.com/doc/inun/np61/lin-mac/klicence.txt'
 
+
+    def url_for_version(self, version):
+        # TODO: url and checksum are architecture dependent
+        # TODO: We currently only support x86_64
+        return 'http://www.nag.com/downloads/impl/npl6a%sna_amd64.tgz' % \
+                str(version).replace('.', '')
+
+
     def install(self, spec, prefix):
         # Set installation directories
         os.environ['INSTALL_TO_BINDIR'] = prefix.bin

var/spack/repos/builtin/packages/pgi/package.py

@@ -27,6 +27,7 @@ class Pgi(Package):
 
     # Licensing
     license_required = True
+    license_comment  = '#'
     license_files    = ['license.dat']
     license_vars     = ['PGROUPD_LICENSE_FILE', 'LM_LICENSE_FILE']
     license_url      = 'http://www.pgroup.com/doc/pgiinstall.pdf'