SF.net SVN: gar:[25117] csw/mgar/pkg/mailman/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25117
          http://sourceforge.net/p/gar/code/25117
Author:   cgrzemba
Date:     2015-06-24 14:10:47 +0000 (Wed, 24 Jun 2015)
Log Message:
-----------
mailman/trunk: cleanup svn conflict

Added Paths:
-----------
    csw/mgar/pkg/mailman/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/mailman/trunk/Makefile

Deleted: csw/mgar/pkg/mailman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailman/trunk/Makefile	2015-06-24 14:05:11 UTC (rev 25116)
+++ csw/mgar/pkg/mailman/trunk/Makefile	2015-06-24 14:10:47 UTC (rev 25117)
@@ -1,64 +0,0 @@
-# $Id$
-# TODO (release-critical prefixed with !, non release-critical with *)
-#
-# ! generally files are installed into wrong directories
-# ! some binaries installed into prefix/bin maybe shouldn't be installed there
-#   at all
-# ! Python modules are clearly installed in a wrong plac
-NAME = mailman
-VERSION = 2.1.20
-
-DESCRIPTION = Mailman mailing list software
-
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES  = $(DISTNAME).tgz
-DISTFILES  += cswusergroup
-
-GARCOMPILER = SOS12U4
-
-INITSMF = /opt/csw/mailman/scripts/mailman
-
-BUILD_DEP_PKGS += CSWpy-dnspython
-
-PACKAGES += CSWmailman
-SPKG_DESC_CSWmailman = Mailman mailing list software
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWmailman += CSWpython27
-RUNTIME_DEP_PKGS_CSWmailman += CSWperl
-RUNTIME_DEP_PKGS_CSWmailman += CSWpm-unix-syslog
-CHECKPKG_OVERRIDES_CSWmailman += surplus-dependency|CSWpython27
-CHECKPKG_OVERRIDES_CSWmailman += surplus-dependency|CSWpm-unix-syslog
-
-# The mailman build system puts files in all sorts of strange places
-prefix=$(BUILD_PREFIX)/$(NAME)
-PRESERVECONF += $(prefix)/Mailman/mm_cfg.py
-PRESERVECONF += $(localstatedir)/mailman/data/sitelist.cfg
-
-CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --without-permcheck
-CONFIGURE_ARGS += --with-python=/opt/csw/bin/python2.7
-CONFIGURE_ARGS += --with-mailhost=mailhost
-CONFIGURE_ARGS += --with-urlhost=example.com
-CONFIGURE_ARGS += --with-mail-gid=mailman
-CONFIGURE_ARGS += --with-cgi-gid=webservd
-CONFIGURE_ARGS += --with-var-prefix=$(localstatedir)
-
-# There is no testsuite
-TEST_SCRIPTS =
-
-PYCOMPILE = 1
-EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
-
-USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup
-
-CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=3|arch_name=i386
-CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/share|root/opt/csw/mailman/Mailman/Defaults.py
-CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/local|root/opt/csw/mailman/messages/hu/README.hu
-
-include gar/category.mk
-
-post-install:
-	ginstall -d $(DESTDIR)$(dir $(USERGROUP))
-	cd $(WORKDIR) && ginstall cswusergroup $(DESTDIR)$(dir $(USERGROUP))
-	$(MAKECOOKIE)

Copied: csw/mgar/pkg/mailman/trunk/Makefile (from rev 25116, csw/mgar/pkg/mailman/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/mailman/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mailman/trunk/Makefile	2015-06-24 14:10:47 UTC (rev 25117)
@@ -0,0 +1,64 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+# ! generally files are installed into wrong directories
+# ! some binaries installed into prefix/bin maybe shouldn't be installed there
+#   at all
+# ! Python modules are clearly installed in a wrong plac
+NAME = mailman
+VERSION = 2.1.20
+
+DESCRIPTION = Mailman mailing list software
+
+MASTER_SITES = $(GNU_MIRROR)
+DISTFILES  = $(DISTNAME).tgz
+DISTFILES  += cswusergroup
+
+GARCOMPILER = SOS12U4
+
+INITSMF = /opt/csw/mailman/scripts/mailman
+
+BUILD_DEP_PKGS += CSWpy-dnspython
+
+PACKAGES += CSWmailman
+SPKG_DESC_CSWmailman = Mailman mailing list software
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWmailman += CSWpython27
+RUNTIME_DEP_PKGS_CSWmailman += CSWperl
+RUNTIME_DEP_PKGS_CSWmailman += CSWpm-unix-syslog
+CHECKPKG_OVERRIDES_CSWmailman += surplus-dependency|CSWpython27
+CHECKPKG_OVERRIDES_CSWmailman += surplus-dependency|CSWpm-unix-syslog
+
+# The mailman build system puts files in all sorts of strange places
+prefix=$(BUILD_PREFIX)/$(NAME)
+PRESERVECONF += $(prefix)/Mailman/mm_cfg.py
+PRESERVECONF += $(localstatedir)/mailman/data/sitelist.cfg
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --without-permcheck
+CONFIGURE_ARGS += --with-python=/opt/csw/bin/python2.7
+CONFIGURE_ARGS += --with-mailhost=mailhost
+CONFIGURE_ARGS += --with-urlhost=example.com
+CONFIGURE_ARGS += --with-mail-gid=mailman
+CONFIGURE_ARGS += --with-cgi-gid=webservd
+CONFIGURE_ARGS += --with-var-prefix=$(localstatedir)
+
+# There is no testsuite
+TEST_SCRIPTS =
+
+PYCOMPILE = 1
+EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
+
+USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup
+
+CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=3|arch_name=i386
+CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/share|root/opt/csw/mailman/Mailman/Defaults.py
+CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/local|root/opt/csw/mailman/messages/hu/README.hu
+
+include gar/category.mk
+
+post-install:
+	ginstall -d $(DESTDIR)$(dir $(USERGROUP))
+	cd $(WORKDIR) && ginstall cswusergroup $(DESTDIR)$(dir $(USERGROUP))
+	$(MAKECOOKIE)

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