Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (f6d70ec9ce8c7d77f7113a0b724ad5a321df3665)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (f6d70ec9ce8c7d77f7113a0b724ad5a321df3665)
  • Date: Wed, 12 Mar 2008 16:39:47 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ChangeLog | 1
http/kompozer/BUILD | 29 +++++
http/kompozer/CONFLICTS | 1
http/kompozer/DEPENDS | 33 ++++++
http/kompozer/DETAILS | 42 +++++++
http/kompozer/HISTORY | 9 +
http/kompozer/INSTALL | 14 ++
http/kompozer/PRE_BUILD | 19 +++
http/kompozer/gfxshared_s.patch | 28 +++++
http/kompozer/kompozer | 18 +++
http/kompozer/kompozer-0.7.10-src.tar.gz.sig |binary
http/kompozer/security_manager_makefile.diff | 142
+++++++++++++++++++++++++++
http/kompozer/xprintutil.patch | 14 ++
http/nvu/BUILD | 30 -----
http/nvu/CONFLICTS | 1
http/nvu/DEPENDS | 34 ------
http/nvu/DETAILS | 4
http/nvu/HISTORY | 3
http/nvu/INSTALL | 15 --
http/nvu/PRE_BUILD | 45 --------
http/nvu/TRIGGERS | 1
http/nvu/desktop/nvu.desktop | 8 -
22 files changed, 360 insertions(+), 131 deletions(-)

New commits:
commit f6d70ec9ce8c7d77f7113a0b724ad5a321df3665
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kompozer: Added a GECKO-based web editing environment (replaces nvu)

diff --git a/ChangeLog b/ChangeLog
index 2f84c08..42f7a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2008-03-12 Eric Sandall <sandalle AT sourcemage.org>
* net/shorewall.gpg.key: Move from spell-level to section level
+ * http/kompozer: Added a GECKO-based web editing environment
(replaces nvu)

2008-03-12 Vlad Glagolev <stealth AT sourcemage.org>
* lua-forge/lgui: new spell, GTK+2 binding for Lua
diff --git a/http/kompozer/BUILD b/http/kompozer/BUILD
new file mode 100755
index 0000000..e7c0a0e
--- /dev/null
+++ b/http/kompozer/BUILD
@@ -0,0 +1,29 @@
+cd $SOURCE_DIRECTORY/mozilla &&
+
+local KOMPOZER_HOME=${INSTALL_ROOT}/usr/lib/kompozer &&
+
+OPTS="--disable-mailnews \
+ --disable-installer \
+ --disable-activex \
+ --disable-activex-scripting \
+ --disable-tests \
+ --disable-oji \
+ --disable-necko-disk-cache \
+ --disable-profilesharing \
+ --disable-pedantic \
+ --disable-mathml \
+ --disable-freetype2 \
+ --disable-svg \
+ --disable-ldap \
+ --disable-debug \
+ --enable-reorder \
+ --enable-cpp-rtti \
+ --enable-xft \
+ --enable-single-profile \
+
--enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
\
+ --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data \
+ --with-pthreads \
+ --with-default-mozilla-five-home=$KOMPOZER_HOME \
+ $OPTS" &&
+
+default_build
diff --git a/http/kompozer/CONFLICTS b/http/kompozer/CONFLICTS
new file mode 100755
index 0000000..6af401c
--- /dev/null
+++ b/http/kompozer/CONFLICTS
@@ -0,0 +1 @@
+conflicts nvu y
diff --git a/http/kompozer/DEPENDS b/http/kompozer/DEPENDS
new file mode 100755
index 0000000..76c7d79
--- /dev/null
+++ b/http/kompozer/DEPENDS
@@ -0,0 +1,33 @@
+depends gtk+2 '--enable-toolkit=gtk2 --enable-default-toolkit=gtk2' &&
+depends jpeg '--with-system-jpeg' &&
+depends libidl '--with-libIDL' &&
+depends libpng '--with-system-png' &&
+depends nspr '--with-system-nspr' &&
+depends perl &&
+depends zip &&
+depends zlib '--with-system-zlib' &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs gtk+2; then
+ depends libx11 &&
+ depends libxext &&
+ depends libxft &&
+ depends libxprintutil &&
+ depends libxrender
+fi &&
+
+optional_depends nss \
+ '--enable-crypto' \
+ '--disable-crypto' \
+ 'for encrypted communications support (e.g. https://)' &&
+
+optional_depends libmng \
+ '--with-system-mng' \
+ '--without-system-mng' \
+ 'for MNG picture format support' &&
+
+optional_depends gnome-vfs2 \
+ '' \
+ '--disable-gnomevfs' \
+ 'for smb:// url support (if enabled in gnome-vfs)'
diff --git a/http/kompozer/DETAILS b/http/kompozer/DETAILS
new file mode 100755
index 0000000..09db788
--- /dev/null
+++ b/http/kompozer/DETAILS
@@ -0,0 +1,42 @@
+ SPELL=kompozer
+ VERSION=0.7.10
+ SOURCE=$SPELL-$VERSION-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ WEB_SITE=http://www.kompozer.net/
+ KEYWORDS="web http editors"
+ ENTERED=20080228
+ SHORT='GECKO-based web editing environment'
+cat << EOF
+KompoZer is a complete Web Authoring System that combines web file management
+and easy-to-use WYSIWYG web page editing capabilities found in Microsoft
+FrontPage, Adobe DreamWeaver and other high end programs.
+
+KompoZer is designed to be extremely easy to use, making it ideal for
+non-technical computer users who want to create an attractive,
+professional-looking web site without needing to know HTML or web coding.
+
+KompoZer is based on Gecko, the layout engine inside Mozilla; it's a
+super-fast, very reliable, standards conformant engine maintained on a daily
+basis by a wide community of developers. Its remarkable support of XML, CSS
and
+JavaScript offers the best authoring platform on the market. Its architecture
+based on XUL makes it the most extensible editing tool ever.
+
+KompoZer is a stand-alone tool; hence its small size and fast speed.
+
+Those who are familiar with the DreamWeaver interface will feel right at home
+with KompoZer:
+ * WYSIWYG editing of pages, making web creation as easy as typing a letter
+ with your word processor.
+ * Integrated file management via FTP. Simply login to your web site and
+ navigate through your files, editing web pages on the fly, directly from
+ your site.
+ * Reliable HTML code creation that will work with all of today's most
popular
+ browsers.
+ * Jump between WYSIWYG Editing Mode and HTML using tabs.
+ * Tabbed editing to make working on multiple pages a snap.
+ * Powerful support for forms, tables, and templates.
+ * The easiest-to-use, most powerful Web Authoring System available for
Desktop
+ Linux, Microsoft Windows and Apple Macintosh users.
+EOF
diff --git a/http/kompozer/HISTORY b/http/kompozer/HISTORY
new file mode 100644
index 0000000..e7688c3
--- /dev/null
+++ b/http/kompozer/HISTORY
@@ -0,0 +1,9 @@
+2008-02-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, CONFLICTS, PRE_BUILD, BUILD: Created
+ * gfxshared_s.patch: Copied from nvu. Upstream bug filed at:
+
http://sourceforge.net/tracker/index.php?func=detail&aid=1913005&group_id=170132&atid=853122
+ * xprintutil.patch: Copied from nvu. Upstream bug filed at:
+
http://sourceforge.net/tracker/index.php?func=detail&aid=1913001&group_id=170132&atid=853122
+ * security_manager_makefile.diff: Copied from nvu to use system
nss/nspr
+ * kompozer: Copied, modified, and renamed from nvu/nvu
+
diff --git a/http/kompozer/INSTALL b/http/kompozer/INSTALL
new file mode 100755
index 0000000..e0c94f9
--- /dev/null
+++ b/http/kompozer/INSTALL
@@ -0,0 +1,14 @@
+default_install &&
+
+#
+# Setup version-agnostic symlink for /usr/lib/nvu
+#
+cd $INSTALL_ROOT/usr/lib &&
+ln -sf kompozer-${VERSION} kompozer &&
+
+#
+# install script so it loads properly even if MOZILLA_FIVE_HOME is
+# not set or set to a different mozilla/firefox directory
+#
+install -m 755 -o root -g root $SCRIPT_DIRECTORY/$SPELL \
+ $INSTALL_ROOT/usr/bin
diff --git a/http/kompozer/PRE_BUILD b/http/kompozer/PRE_BUILD
new file mode 100755
index 0000000..893d797
--- /dev/null
+++ b/http/kompozer/PRE_BUILD
@@ -0,0 +1,19 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/mozilla &&
+
+cp composer/config/mozconfig.linux .mozconfig &&
+
+patch -p1 < $SCRIPT_DIRECTORY/gfxshared_s.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/xprintutil.patch &&
+
+#
+# Add user optimizations
+#
+sedit "s:#export CFLAGS=.*:export CFLAGS=\"$CFLAGS\":" .mozconfig &&
+sedit "s:#export CXXFLAGS=.*:export CXXFLAGS=\"$CXXFLAGS\":" .mozconfig &&
+
+#
+# Use the system provided NSS/NSPR libraries
+#
+message "${MESSAGE_COLOR}Use system NSS/NSPR libraries${DEFAULT_COLOR}" &&
+mozilla_remove_nspr_nss
diff --git a/http/kompozer/gfxshared_s.patch b/http/kompozer/gfxshared_s.patch
new file mode 100644
index 0000000..f96f0b7
--- /dev/null
+++ b/http/kompozer/gfxshared_s.patch
@@ -0,0 +1,28 @@
+diff -Naur mozilla.orig/gfx/src/gtk/Makefile.in
mozilla/gfx/src/gtk/Makefile.in
+--- mozilla.orig/gfx/src/gtk/Makefile.in 2007-04-17 12:44:26.861000605
-0700
++++ mozilla/gfx/src/gtk/Makefile.in 2007-04-17 12:45:12.523034576 -0700
+@@ -135,6 +135,8 @@
+ SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)gfxft2_s.$(LIB_SUFFIX)
+ endif
+
++EXTRA_DSO_LDOPTS = $(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX)
++
+ include $(topsrcdir)/config/rules.mk
+
+ ifdef MOZ_ENABLE_XINERAMA
+@@ -145,7 +147,6 @@
+ EXTRA_DSO_LDOPTS += \
+ $(LIBS_DIR) \
+ -lgkgfx \
+- -lgfxshared_s \
+ $(GFX_XINERAMA_LIBS) \
+ -lgtksuperwin \
+ $(MOZ_COMPONENT_LIBS) \
+@@ -165,7 +166,6 @@
+ ifdef MOZ_ENABLE_GTK2
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+ -lgkgfx \
+- -lgfxshared_s \
+ $(GFX_XINERAMA_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(MOZ_UNICHARUTIL_LIBS) \
diff --git a/http/kompozer/kompozer b/http/kompozer/kompozer
new file mode 100644
index 0000000..1c3521a
--- /dev/null
+++ b/http/kompozer/kompozer
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Created by Eric Sandall 2007-04-17
+#
+# This script is here to set the correct LD_LIBRARY_PATH for firefox 1.0+
+# based on the information from this thread:
+# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
+#
+
+export LD_LIBRARY_PATH=/usr/lib/kompozer
+remote=""
+if /usr/lib/kompozer/kompozer-bin -remote "ping()" > /dev/null 2>&1 ; then
+ if [ -z "$@" ] ; then
+ remote='-remote xfeDoCommand(openBrowser)'
+ fi
+fi
+
+/usr/lib/kompozer/kompozer-bin $remote $@
diff --git a/http/kompozer/kompozer-0.7.10-src.tar.gz.sig
b/http/kompozer/kompozer-0.7.10-src.tar.gz.sig
new file mode 100644
index 0000000..b2da489
Binary files /dev/null and b/http/kompozer/kompozer-0.7.10-src.tar.gz.sig
differ
diff --git a/http/kompozer/security_manager_makefile.diff
b/http/kompozer/security_manager_makefile.diff
new file mode 100644
index 0000000..27f978b
--- /dev/null
+++ b/http/kompozer/security_manager_makefile.diff
@@ -0,0 +1,142 @@
+diff -Naur mozilla.orig/security/manager/Makefile.in
mozilla/security/manager/Makefile.in
+--- mozilla.orig/security/manager/Makefile.in 2007-04-17 11:54:03.749195266
-0700
++++ mozilla/security/manager/Makefile.in 2007-04-17 11:54:05.041998040
-0700
+@@ -30,35 +30,6 @@
+ MODULE = psm
+
+ PACKAGE_FILE = psm.pkg
+-PACKAGE_VARS += \
+- NSS3_LIB \
+- SMIME3_LIB \
+- SSL3_LIB \
+- SOFTOKEN3_LIB \
+- SOFTOKEN3_CHK \
+- LOADABLE_ROOT_MODULE \
+- HAVE_FREEBL_MODULES \
+- $(NULL)
+-
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-
+-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
+-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
+-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
+-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-
+-ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+-ifeq (,$(filter i86pc ia64,$(OS_TEST)))
+-ifndef HAVE_64BIT_OS
+-HAVE_FREEBL_MODULES = 1
+-FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
+-FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
+-FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
+-FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
+-endif
+-endif
+-endif
+
+ # NSS makefiles are not safe for parallel execution.
+ DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+@@ -120,19 +91,7 @@
+ include $(topsrcdir)/config/rules.mk
+
+ # Attempt to properly handle NSS' refusal to implement a dependency system
+-export:: .nss.cleaned
+-
+-.nss.cleaned: .nss.checkout
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
+-endif
+- touch $@
+-
+-.nss.checkout:
+- touch $(srcdir)/$@
++export::
+
+ dependclean export packages chrome::
+ $(MAKE) -C boot $@
+@@ -143,48 +102,6 @@
+
+ libs::
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+-ifeq ($(OS_ARCH),WINNT)
+- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-endif
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS)
+-endif
+-ifndef DISABLE_DIST_GRE
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
+-ifdef HAVE_FREEBL_MODULES
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
+-endif
+-endif
+-ifndef _SKIP_OLD_GRE_INSTALL
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_MODULES
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
+-endif
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ ifdef MOZ_XUL
+@@ -192,20 +109,6 @@
+ endif
+
+ install::
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE)
$(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK)
$(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_MODULES
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK)
$(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE)
$(DESTDIR)$(mozappdir)
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ ifdef MOZ_XUL
+@@ -219,11 +122,6 @@
+ $(MAKE) -C pki $@
+ endif
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
+-endif
+
+ echo-requires-recursive::
+ $(MAKE) -C boot $@
diff --git a/http/kompozer/xprintutil.patch b/http/kompozer/xprintutil.patch
new file mode 100644
index 0000000..1c7b85f
--- /dev/null
+++ b/http/kompozer/xprintutil.patch
@@ -0,0 +1,14 @@
+diff -Naur mozilla.orig/gfx/src/gtk/Makefile.in
mozilla/gfx/src/gtk/Makefile.in
+--- mozilla.orig/gfx/src/gtk/Makefile.in 2007-04-17 12:44:26.861000605
-0700
++++ mozilla/gfx/src/gtk/Makefile.in 2007-04-17 13:03:22.151804875 -0700
+@@ -197,9 +197,9 @@
+ endif
+
+ ifdef MOZ_ENABLE_XPRINT
++EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)xprintutil.$(LIB_SUFFIX)
+ DEFINES += -DUSE_XPRINT -DUSE_MOZILLA_TYPES
+ EXTRA_DSO_LDOPTS += \
+- -lxprintutil \
+ $(MOZ_XPRINT_LDFLAGS)
+ endif
+
diff --git a/http/nvu/BUILD b/http/nvu/BUILD
index cc09cb3..27ba77d 100755
--- a/http/nvu/BUILD
+++ b/http/nvu/BUILD
@@ -1,29 +1 @@
-cd $SOURCE_DIRECTORY/mozilla &&
-
-local NVU_HOME=${INSTALL_ROOT}/usr/lib/nvu &&
-
-OPTS="--disable-mailnews \
- --disable-installer \
- --disable-activex \
- --disable-activex-scripting \
- --disable-tests \
- --disable-oji \
- --disable-necko-disk-cache \
- --disable-profilesharing \
- --disable-pedantic \
- --disable-mathml \
- --disable-freetype2 \
- --disable-svg \
- --disable-ldap \
- --disable-debug \
- --enable-reorder \
- --enable-cpp-rtti \
- --enable-xft \
- --enable-single-profile \
-
--enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
\
- --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data \
- --with-pthreads \
- --with-default-mozilla-five-home=$NVU_HOME \
- $OPTS" &&
-
-default_build
+true
diff --git a/http/nvu/CONFLICTS b/http/nvu/CONFLICTS
new file mode 100755
index 0000000..6af401c
--- /dev/null
+++ b/http/nvu/CONFLICTS
@@ -0,0 +1 @@
+conflicts nvu y
diff --git a/http/nvu/DEPENDS b/http/nvu/DEPENDS
index 76c7d79..2ebeb53 100755
--- a/http/nvu/DEPENDS
+++ b/http/nvu/DEPENDS
@@ -1,33 +1 @@
-depends gtk+2 '--enable-toolkit=gtk2 --enable-default-toolkit=gtk2' &&
-depends jpeg '--with-system-jpeg' &&
-depends libidl '--with-libIDL' &&
-depends libpng '--with-system-png' &&
-depends nspr '--with-system-nspr' &&
-depends perl &&
-depends zip &&
-depends zlib '--with-system-zlib' &&
-
-source $GRIMOIRE/FUNCTIONS &&
-
-if check_if_xorg_modular_libs gtk+2; then
- depends libx11 &&
- depends libxext &&
- depends libxft &&
- depends libxprintutil &&
- depends libxrender
-fi &&
-
-optional_depends nss \
- '--enable-crypto' \
- '--disable-crypto' \
- 'for encrypted communications support (e.g. https://)' &&
-
-optional_depends libmng \
- '--with-system-mng' \
- '--without-system-mng' \
- 'for MNG picture format support' &&
-
-optional_depends gnome-vfs2 \
- '' \
- '--disable-gnomevfs' \
- 'for smb:// url support (if enabled in gnome-vfs)'
+depends kompozer
diff --git a/http/nvu/DETAILS b/http/nvu/DETAILS
index 77b60e0..cebc3e6 100755
--- a/http/nvu/DETAILS
+++ b/http/nvu/DETAILS
@@ -1,9 +1,7 @@
SPELL=nvu
VERSION=1.0
- SOURCE=$SPELL-$VERSION-sources.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://cvs.nvu.com/download/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ PATCHLEVEL=1
WEB_SITE=http://www.nvu.com/
KEYWORDS="web http editors"
ENTERED=20070417
diff --git a/http/nvu/HISTORY b/http/nvu/HISTORY
index 3d1f38d..7985d0b 100644
--- a/http/nvu/HISTORY
+++ b/http/nvu/HISTORY
@@ -1,3 +1,6 @@
+2008-03-12 Eric Sandall <sandalle AT sourcemage.org>
+ * Deprecate in favour of maintained kompozer (fork of defunct nvu)
+
2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
Fixes Bug #7977
diff --git a/http/nvu/INSTALL b/http/nvu/INSTALL
index 0505ca6..27ba77d 100755
--- a/http/nvu/INSTALL
+++ b/http/nvu/INSTALL
@@ -1,14 +1 @@
-default_install &&
-
-#
-# Setup version-agnostic symlink for /usr/lib/nvu
-#
-cd $INSTALL_ROOT/usr/lib &&
-ln -sf nvu-${VERSION} nvu &&
-
-#
-# install script so it loads properly even if MOZILLA_FIVE_HOME is
-# not set or set to a different mozilla/firefox directory
-#
-install -m 755 -o root -g root $SCRIPT_DIRECTORY/$SPELL \
- $INSTALL_ROOT/usr/bin
+true
diff --git a/http/nvu/PRE_BUILD b/http/nvu/PRE_BUILD
index 5d8856d..27ba77d 100755
--- a/http/nvu/PRE_BUILD
+++ b/http/nvu/PRE_BUILD
@@ -1,44 +1 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file '' &&
-cd mozilla &&
-
-cp composer/config/mozconfig.linux .mozconfig &&
-
-#
-# Add user optimizations
-#
-sedit "s:#export CFLAGS=.*:export CFLAGS=\"$CFLAGS\":" .mozconfig &&
-sedit "s:#export CXXFLAGS=.*:export CXXFLAGS=\"$CXXFLAGS\":" .mozconfig &&
-
-#
-# Fix compilation with gcc 4.1.x
-#
-message "${MESSAGE_COLOR}Fixing compilation with gcc 4.1.x${DEFAULT_COLOR}"
&&
-patch -p1 < $SCRIPT_DIRECTORY/nvu-1.0-gcc4-1.patch
&&
-
-#
-# Fix compilation with glibc 2.4
-#
-message "${MESSAGE_COLOR}Fixing compilation with glibc 2.4${DEFAULT_COLOR}"
&&
-patch -p1 < $SCRIPT_DIRECTORY/nvu-1.0-glibc-2.4.patch
&&
-
-#
-# Fix linking against gfxshared
-#
-message "${MESSAGE_COLOR}Fix linking against gfxshared_s${DEFAULT_COLOR}"
&&
-patch -p1 < $SCRIPT_DIRECTORY/gfxshared_s.patch
&&
-
-#
-# Fix linking against xprintutil
-#
-message "${MESSAGE_COLOR}Fix linking against xprintutil${DEFAULT_COLOR}" &&
-patch -p1 < $SCRIPT_DIRECTORY/xprintutil.patch &&
-
-#
-# Use the system provided NSS/NSPR libraries
-#
-message "${MESSAGE_COLOR}Use system NSS/NSPR libraries${DEFAULT_COLOR}" &&
-mozilla_remove_nspr_nss &&
-
-message "${MESSAGE_COLOR}Begin building
${SPELL_COLOR}$SPELL${DEFAULT_COLOR}..."
+true
diff --git a/http/nvu/TRIGGERS b/http/nvu/TRIGGERS
new file mode 100755
index 0000000..9d130bc
--- /dev/null
+++ b/http/nvu/TRIGGERS
@@ -0,0 +1 @@
+on_cast nvu dispel_self
diff --git a/http/nvu/desktop/nvu.desktop b/http/nvu/desktop/nvu.desktop
deleted file mode 100644
index f464eeb..0000000
--- a/http/nvu/desktop/nvu.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Nvu
-Exec=nvu
-Icon=/usr/lib/nvu/chrome/icons/default/default.xpm
-Terminal=false
-Type=Application
-Categories=Application;Network;Browsers;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (f6d70ec9ce8c7d77f7113a0b724ad5a321df3665), Eric Sandall, 03/12/2008

Archive powered by MHonArc 2.6.24.

Top of Page