[csw-devel] SF.net SVN: gar:[14878] csw/mgar/pkg/gnupg/trunk/Makefile

[bonivart at users.sourceforge.net]

Revision: 14878
          http://gar.svn.sourceforge.net/gar/?rev=14878&view=rev
Author:   bonivart
Date:     2011-06-24 12:05:40 +0000 (Fri, 24 Jun 2011)

Log Message:
-----------
gnupg/trunk: clean up

Modified Paths:
--------------
    csw/mgar/pkg/gnupg/trunk/Makefile

Modified: csw/mgar/pkg/gnupg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg/trunk/Makefile	2011-06-24 11:39:35 UTC (rev 14877)
+++ csw/mgar/pkg/gnupg/trunk/Makefile	2011-06-24 12:05:40 UTC (rev 14878)
@@ -1,5 +1,5 @@
-NAME    = gnupg
-VERSION = 1.4.11
+NAME       = gnupg
+VERSION    = 1.4.11
 CATEGORIES = apps
 
 DESCRIPTION = GnuPG is a complete and free replacement for PGP.
@@ -37,6 +37,7 @@
 CONFIGURE_ARGS += --disable-asm
 
 EXTRA_MERGE_EXCLUDE_FILES += .*/charset.alias
+# Collision with gnupg2
 EXTRA_MERGE_EXCLUDE_FILES += .*/gpg-zip.1
 
 PROTOTYPE_MODIFIERS  = suid
@@ -48,6 +49,5 @@
 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.ru.1
 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.1
 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnupg1.info
-#CHECKPKG_OVERRIDES_CSWgnupg += file-collision|/opt/csw/share/man/man1/gpg-zip.1|CSWgnupg|CSWgnupg2
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.