# HG changeset patch # User John Beck # Date 1365702806 25200 # Node ID edecf9fcf54d6e88b4a80e5a87224af4bd4ee5fb # Parent 68c7d53a1374e834993ed4ed1f30a0e4c98d1e40 16624941 enable 64-bit for mutt diff -r 68c7d53a1374 -r edecf9fcf54d components/mutt/Makefile --- a/components/mutt/Makefile Thu Apr 11 10:50:53 2013 -0700 +++ b/components/mutt/Makefile Thu Apr 11 10:53:26 2013 -0700 @@ -57,14 +57,14 @@ # Add in the C compiler information to the muttbug (a.k.a. flea) script. COMPONENT_POST_CONFIGURE_ACTION = \ $(GSED) -i 's%XXX-CUSAGE-XXX%$(shell $(CC) -V 2>&1 | head -1)%' \ - $(BUILD_DIR_32)/muttbug.sh + $(BUILD_DIR_64)/muttbug.sh ASLR_MODE = $(ASLR_ENABLE) # common targets -build: $(BUILD_32) +build: $(BUILD_64) -install: $(INSTALL_32) +install: $(INSTALL_64) test: $(NO_TESTS) diff -r 68c7d53a1374 -r edecf9fcf54d components/mutt/mutt.p5m --- a/components/mutt/mutt.p5m Thu Apr 11 10:50:53 2013 -0700 +++ b/components/mutt/mutt.p5m Thu Apr 11 10:53:26 2013 -0700 @@ -34,30 +34,27 @@ default preserve renamenew> default mode 0644> default preserve renamenew> - set name=pkg.fmri value=pkg:/mail/mutt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="The Mutt E-Mail Client" -set name=pkg.description value="Mutt is a small but very powerful text-based mail client for Unix operating systems." +set name=pkg.description \ + value="Mutt is a small but very powerful text-based mail client for Unix operating systems." set name=com.oracle.info.description value="the Mutt email client" -set name=info.classification value="org.opensolaris.category.2008:Applications/Internet" +set name=info.classification \ + value=org.opensolaris.category.2008:Applications/Internet +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2008/135 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -set name=org.opensolaris.arc-caseid \ - value=PSARC/2008/135 - -license mutt.license license=GPLv2 - file path=etc/mutt/Muttrc file path=etc/mutt/Muttrc.dist file path=etc/mutt/mime.types file path=etc/mutt/mime.types.dist -file path=usr/bin/flea -file path=usr/bin/mutt -file path=usr/bin/muttbug -file path=usr/bin/pgpewrap -file path=usr/bin/pgpring -file path=usr/bin/smime_keys +file usr/bin/$(MACH64)/flea path=usr/bin/flea +file usr/bin/$(MACH64)/mutt path=usr/bin/mutt +file usr/bin/$(MACH64)/muttbug path=usr/bin/muttbug +file usr/bin/$(MACH64)/pgpewrap path=usr/bin/pgpewrap +file usr/bin/$(MACH64)/pgpring path=usr/bin/pgpring +file usr/bin/$(MACH64)/smime_keys path=usr/bin/smime_keys file path=usr/share/doc/mutt/COPYRIGHT file path=usr/share/doc/mutt/ChangeLog file path=usr/share/doc/mutt/GPL @@ -151,9 +148,10 @@ file path=usr/share/man/man1/flea.1 file path=usr/share/man/man1/mutt.1 file path=usr/share/man/man1/muttbug.1 +file pgpewrap.1 path=usr/share/man/man1/pgpewrap.1 +file pgpring.1 path=usr/share/man/man1/pgpring.1 file path=usr/share/man/man1/smime_keys.1 file path=usr/share/man/man5/mbox.5 file path=usr/share/man/man5/mmdf.5 file path=usr/share/man/man5/muttrc.5 -file pgpewrap.1 path=usr/share/man/man1/pgpewrap.1 -file pgpring.1 path=usr/share/man/man1/pgpring.1 +license mutt.license license=GPLv2