mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-27 00:57:50 +00:00
- Use new Makefile.common from mozilla
This commit is contained in:
Michael Johnson
parent
36353c589f
commit
492ede9178
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=149946
@ -3,6 +3,7 @@
|
||||
# Whom: Thierry Thomas <thierry@pompo.net>
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $
|
||||
#
|
||||
|
||||
PORTNAME= nvu
|
||||
@ -14,125 +15,25 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources
|
||||
MAINTAINER= ahze@FreeBSD.org
|
||||
COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage
|
||||
|
||||
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
Xft.2:${PORTSDIR}/x11-fonts/libXft
|
||||
|
||||
USE_X_PREFIX= yes
|
||||
USE_BZIP2= yes
|
||||
USE_PERL5= yes
|
||||
USE_GNOME= gtk20 libidl
|
||||
USE_REINPLACE= yes
|
||||
WANT_GNOME= yes
|
||||
USE_GMAKE= yes
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||
NVU= ${PORTNAME}-${DISTVERSION}
|
||||
FAKEDIR= ${WRKDIR}/FAKE
|
||||
WRKSRC= ${WRKDIR}/mozilla
|
||||
PLIST= ${WRKDIR}/plist
|
||||
MAKEFILE= client.mk
|
||||
ALL_TARGET= build_all
|
||||
PKG_CONFIGS= nvu-gtkmozembed.pc nvu-js.pc nvu-nspr.pc \
|
||||
nvu-nss.pc nvu-plugin.pc nvu-xpcom.pc
|
||||
EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/*
|
||||
PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include "${.CURDIR}/../mozilla/Makefile.common"
|
||||
|
||||
.if ${PERL_LEVEL} < 500600
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_OPTIMIZED_CFLAGS)
|
||||
@${ECHO_MSG} "Enable -O2 optimizations by defining"
|
||||
@${ECHO_MSG} "WITH_OPTIMIZED_CFLAGS"
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
# Remove so we can actaully find programs that are not in /usr/bin
|
||||
@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
|
||||
@${SED} -e 's|%%NVUDIR%%|${PREFIX}/lib/${NVU}|g ; \
|
||||
s|%%PREFIX%%|${PREFIX}|g ; \
|
||||
s|%%X11BASE%%|${X11BASE}|g' \
|
||||
< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
|
||||
@${SED} -e 's|%%NVUDIR%%|${PREFIX}/lib/${NVU}|g' \
|
||||
< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
|
||||
@${SED} -e 's|%%CC%%|${CC}|; s|%%CXX%%|${CXX}|; \
|
||||
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|; \
|
||||
s|%%CFLAGS%%|${CFLAGS}|; \
|
||||
s|%%CXXFLAGS%%|${CXXFLAGS}|; \
|
||||
s|%%PREFIX%%|${FAKEDIR}|; \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|' \
|
||||
${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
|
||||
# Stupid workaround..
|
||||
.for f in toolkit/components/Makefile.in toolkit/components/gnome/Makefile.in
|
||||
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/${f}
|
||||
.endfor
|
||||
.if defined(WITH_DEBUG)
|
||||
@${ECHO_CMD} "ac_add_options --enable-debug" >> ${WRKSRC}/.mozconfig
|
||||
@${ECHO_CMD} "ac_add_options --disable-strip" >> ${WRKSRC}/.mozconfig
|
||||
.else
|
||||
@${ECHO_CMD} "ac_add_options --disable-debug" >> ${WRKSRC}/.mozconfig
|
||||
@${ECHO_CMD} "ac_add_options --enable-strip" >> ${WRKSRC}/.mozconfig
|
||||
.endif
|
||||
.if defined(WITH_OPTIMIZED_CFLAGS)
|
||||
@${ECHO_CMD} "ac_add_options --enable-optimize=-O2" >> ${WRKSRC}/.mozconfig
|
||||
.endif
|
||||
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
|
||||
s|-lpthread|${PTHREAD_LIBS}|g; \
|
||||
s|/usr/X11R6|${X11BASE}|g' \
|
||||
${WRKSRC}/configure \
|
||||
${WRKSRC}/nsprpub/configure
|
||||
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
|
||||
${WRKSRC}/nsprpub/configure \
|
||||
${WRKSRC}/security/coreconf/FreeBSD.mk \
|
||||
${WRKSRC}/js/src/Makefile.in
|
||||
|
||||
pre-install:
|
||||
${RM} -rf ${PLIST} ${FAKEDIR}
|
||||
${TOUCH} -f ${PLIST}
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
|
||||
${MAKEFILE} ${MAKE_ARGS} install
|
||||
${ECHO_CMD} bin/nvu >> ${PLIST}
|
||||
${ECHO_CMD} bin/nvu-config >> ${PLIST}
|
||||
cd ${FAKEDIR}/lib/${NVU} && ${FIND} -s * -type f -o -type l | \
|
||||
${SED} -e 's|^|lib/${NVU}/|' >> ${PLIST} \
|
||||
&& ${FIND} -d * -type d | \
|
||||
${SED} -e 's:^:@dirrm lib/${NVU}/:' >> ${PLIST}
|
||||
${ECHO_CMD} @dirrm lib/${NVU} >> ${PLIST}
|
||||
.for p in ${PKG_CONFIGS}
|
||||
${ECHO_CMD} ${p:S|^|libdata/pkgconfig/|} >> ${PLIST}
|
||||
.endfor
|
||||
cd ${FAKEDIR}/include/${NVU} && ${FIND} -s * -type f -o -type l | \
|
||||
${SED} -e 's|^|include/${NVU}/|' >> ${PLIST} \
|
||||
&& ${FIND} -d * -type d | \
|
||||
${SED} -e 's|^|@dirrm include/${NVU}/|' >> ${PLIST}
|
||||
${ECHO_CMD} @dirrm include/${NVU} >> ${PLIST}
|
||||
|
||||
do-install:
|
||||
${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
|
||||
${FAKEDIR}/bin/* \
|
||||
${FAKEDIR}/lib/pkgconfig/*
|
||||
${RM} -f ${FAKEDIR}/bin/*.bak ${FAKEDIR}/lib/pkgconfig/*.bak
|
||||
${MKDIR} ${PREFIX}/lib/${NVU}
|
||||
${CHMOD} 755 ${PREFIX}/lib/${NVU}
|
||||
${INSTALL_SCRIPT} ${FAKEDIR}/bin/* ${PREFIX}/bin
|
||||
if [ ! -d ${PREFIX}/libdata/pkgconfig ]; then \
|
||||
${MKDIR} ${PREFIX}/libdata/pkgconfig ; \
|
||||
fi
|
||||
.for i in ${PKG_CONFIGS}
|
||||
${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/${i} ${PREFIX}/libdata/pkgconfig/
|
||||
.endfor
|
||||
cd ${FAKEDIR}/lib/${NVU} && ${FIND} . | \
|
||||
${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${NVU}
|
||||
cd ${FAKEDIR}/include/${NVU} && ${FIND} . | \
|
||||
${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${NVU}
|
||||
|
||||
post-install:
|
||||
.if !defined(PACKAGE_BUILDING)
|
||||
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
|
||||
.endif
|
||||
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
|
||||
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export BUILD_OFFICIAL=1
|
||||
|
||||
export MOZ_STANDALONE_COMPOSER=1
|
||||
mk_add_options MOZ_STANDALONE_COMPOSER=1
|
||||
|
||||
export CC="%%CC%%"
|
||||
export CXX="%%CXX%%"
|
||||
export OS_LIBS="%%PTHREAD_LIBS%%"
|
||||
export CFLAGS="%%CFLAGS%%"
|
||||
export CXXFLAGS="%%CXXFLAGS%%"
|
||||
|
||||
ac_add_options --enable-single-profile
|
||||
ac_add_options --disable-svg
|
||||
ac_add_options --disable-ldap
|
||||
ac_add_options --disable-mailnews
|
||||
ac_add_options --disable-installer
|
||||
ac_add_options --disable-activex
|
||||
ac_add_options --disable-activex-scripting
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-oji
|
||||
ac_add_options --disable-necko-disk-cache
|
||||
ac_add_options --disable-profilesharing
|
||||
ac_add_options --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
|
||||
ac_add_options --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
|
||||
ac_add_options --disable-pedantic
|
||||
ac_add_options --disable-short-wchar
|
||||
ac_add_options --enable-xprint
|
||||
ac_add_options --enable-freetype2
|
||||
ac_add_options --enable-crypto
|
||||
ac_add_options --disable-mathml
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --enable-toolkit=gtk2
|
||||
ac_add_options --enable-default-toolkit=gtk2
|
||||
ac_add_options --enable-image-decoders=default,-xbm
|
||||
ac_add_options --with-system-jpeg=%%LOCALBASE%%
|
||||
ac_add_options --with-system-png=%%LOCALBASE%%
|
||||
ac_add_options --with-pthreads
|
||||
ac_add_options --enable-xft
|
||||
ac_add_options --prefix=%%PREFIX%%
|
||||
18
www/kompozer/files/patch-config_autoconf.mk.in
Normal file
18
www/kompozer/files/patch-config_autoconf.mk.in
Normal file
@ -0,0 +1,18 @@
|
||||
--- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005
|
||||
+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005
|
||||
@@ -50,13 +50,13 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
+includedir = @includedir@/%%MOZILLA%%
|
||||
libdir = @libdir@
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
|
||||
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
+mozappdir = $(libdir)/%%MOZILLA%%
|
||||
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
||||
mrelibdir = $(mredir)/lib
|
||||
|
||||
15
www/kompozer/files/patch-gfx-src-gtk-Makefile.in
Normal file
15
www/kompozer/files/patch-gfx-src-gtk-Makefile.in
Normal file
@ -0,0 +1,15 @@
|
||||
When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
|
||||
contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
|
||||
|
||||
This causes an error, because libgfxshared_s is only under dist/lib.
|
||||
|
||||
-mi
|
||||
|
||||
--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
|
||||
+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
|
||||
@@ -165,4 +165,5 @@
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
|
||||
+ $(LIBS_DIR) \
|
||||
-lgkgfx \
|
||||
-lgfxshared_s \
|
||||
25
www/kompozer/files/patch-libm
Normal file
25
www/kompozer/files/patch-libm
Normal file
@ -0,0 +1,25 @@
|
||||
--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
|
||||
+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
|
||||
@@ -148,5 +148,4 @@
|
||||
endif
|
||||
|
||||
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
|
||||
JSMATH_PRELINK = jsmathtemp.o
|
||||
JS_SAFE_ARENA = 1
|
||||
@@ -320,7 +319,4 @@
|
||||
endif
|
||||
@$(RM) -f $(JSMATH_PRELINK)
|
||||
-else
|
||||
-# Create dependency so we build fdlibm
|
||||
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
|
||||
endif
|
||||
|
||||
--- js/Makefile.in Sun Mar 23 14:36:00 2003
|
||||
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
|
||||
@@ -46,5 +46,5 @@
|
||||
#
|
||||
|
||||
-DIRS = src/fdlibm src
|
||||
+DIRS = src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
@ -1,11 +0,0 @@
|
||||
--- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004
|
||||
+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004
|
||||
@@ -90,7 +90,7 @@
|
||||
#define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init
|
||||
#define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy
|
||||
#define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a))
|
||||
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
|
||||
+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
|
||||
#if defined(DARWIN)
|
||||
#define _PT_PTHREAD_CONDATTR_INIT(x) 0
|
||||
#else
|
||||
@ -1,14 +0,0 @@
|
||||
--- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004
|
||||
+++ nsprpub/pr/src/io/prprf.c Fri Mar 19 15:26:55 2004
|
||||
@@ -51,7 +51,10 @@
|
||||
** Note: on some platforms va_list is defined as an array,
|
||||
** and requires array notation.
|
||||
*/
|
||||
-#if (defined(LINUX) && defined(__x86_64__))
|
||||
+#if defined(__amd64__)
|
||||
+#include <stdarg.h>
|
||||
+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
|
||||
+#elif (defined(LINUX) && defined(__x86_64__))
|
||||
#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
|
||||
#elif (defined(LINUX) && defined(__powerpc__)) || \
|
||||
(defined(LINUX) && defined(__s390__)) || \
|
||||
@ -1,124 +0,0 @@
|
||||
--- nsprpub/pr/include/md/_freebsd.cfg.orig Sat Nov 15 15:36:12 2003
|
||||
+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 13:36:44 2004
|
||||
@@ -91,7 +91,7 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 4
|
||||
#define PR_ALIGN_OF_POINTER 4
|
||||
|
||||
-#elif defined(__alpha)
|
||||
+#elif defined(__alpha__)
|
||||
|
||||
#define IS_LITTLE_ENDIAN 1
|
||||
#undef IS_BIG_ENDIAN
|
||||
@@ -138,8 +138,7 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 8
|
||||
#define PR_ALIGN_OF_POINTER 8
|
||||
|
||||
-#elif defined(__sparc__)
|
||||
-
|
||||
+#elif defined(__sparc64__)
|
||||
#undef IS_LITTLE_ENDIAN
|
||||
#define IS_BIG_ENDIAN 1
|
||||
#define HAVE_LONG_LONG
|
||||
@@ -185,6 +184,102 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 8
|
||||
#define PR_ALIGN_OF_POINTER 8
|
||||
|
||||
+#elif defined(__ia64__)
|
||||
+#define IS_LITTLE_ENDIAN 1
|
||||
+#undef IS_BIG_ENDIAN
|
||||
+#define HAVE_LONG_LONG
|
||||
+#define HAVE_ALIGNED_DOUBLES
|
||||
+#define HAVE_ALIGNED_LONGLONGS
|
||||
+#define IS_64
|
||||
+
|
||||
+#define PR_BYTES_PER_BYTE 1
|
||||
+#define PR_BYTES_PER_SHORT 2
|
||||
+#define PR_BYTES_PER_INT 4
|
||||
+#define PR_BYTES_PER_INT64 8
|
||||
+#define PR_BYTES_PER_LONG 8
|
||||
+#define PR_BYTES_PER_FLOAT 4
|
||||
+#define PR_BYTES_PER_DOUBLE 8
|
||||
+#define PR_BYTES_PER_WORD 8
|
||||
+#define PR_BYTES_PER_DWORD 8
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE 8
|
||||
+#define PR_BITS_PER_SHORT 16
|
||||
+#define PR_BITS_PER_INT 32
|
||||
+#define PR_BITS_PER_INT64 64
|
||||
+#define PR_BITS_PER_LONG 64
|
||||
+#define PR_BITS_PER_FLOAT 32
|
||||
+#define PR_BITS_PER_DOUBLE 64
|
||||
+#define PR_BITS_PER_WORD 64
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE_LOG2 3
|
||||
+#define PR_BITS_PER_SHORT_LOG2 4
|
||||
+#define PR_BITS_PER_INT_LOG2 5
|
||||
+#define PR_BITS_PER_INT64_LOG2 6
|
||||
+#define PR_BITS_PER_LONG_LOG2 6
|
||||
+#define PR_BITS_PER_FLOAT_LOG2 5
|
||||
+#define PR_BITS_PER_DOUBLE_LOG2 6
|
||||
+#define PR_BITS_PER_WORD_LOG2 6
|
||||
+
|
||||
+#define PR_ALIGN_OF_SHORT 2
|
||||
+#define PR_ALIGN_OF_INT 4
|
||||
+#define PR_ALIGN_OF_LONG 8
|
||||
+#define PR_ALIGN_OF_INT64 8
|
||||
+#define PR_ALIGN_OF_FLOAT 4
|
||||
+#define PR_ALIGN_OF_DOUBLE 8
|
||||
+#define PR_ALIGN_OF_POINTER 8
|
||||
+#define PR_ALIGN_OF_WORD 8
|
||||
+
|
||||
+#define PR_BYTES_PER_WORD_LOG2 3
|
||||
+#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
+
|
||||
+#elif defined(__amd64__)
|
||||
+#define IS_LITTLE_ENDIAN 1
|
||||
+#undef IS_BIG_ENDIAN
|
||||
+#define IS_64
|
||||
+
|
||||
+#define PR_BYTES_PER_BYTE 1
|
||||
+#define PR_BYTES_PER_SHORT 2
|
||||
+#define PR_BYTES_PER_INT 4
|
||||
+#define PR_BYTES_PER_INT64 8
|
||||
+#define PR_BYTES_PER_LONG 8
|
||||
+#define PR_BYTES_PER_FLOAT 4
|
||||
+#define PR_BYTES_PER_DOUBLE 8
|
||||
+#define PR_BYTES_PER_WORD 8
|
||||
+#define PR_BYTES_PER_DWORD 8
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE 8
|
||||
+#define PR_BITS_PER_SHORT 16
|
||||
+#define PR_BITS_PER_INT 32
|
||||
+#define PR_BITS_PER_INT64 64
|
||||
+#define PR_BITS_PER_LONG 64
|
||||
+#define PR_BITS_PER_FLOAT 32
|
||||
+#define PR_BITS_PER_DOUBLE 64
|
||||
+#define PR_BITS_PER_WORD 64
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE_LOG2 3
|
||||
+#define PR_BITS_PER_SHORT_LOG2 4
|
||||
+#define PR_BITS_PER_INT_LOG2 5
|
||||
+#define PR_BITS_PER_INT64_LOG2 6
|
||||
+#define PR_BITS_PER_LONG_LOG2 6
|
||||
+#define PR_BITS_PER_FLOAT_LOG2 5
|
||||
+#define PR_BITS_PER_DOUBLE_LOG2 6
|
||||
+#define PR_BITS_PER_WORD_LOG2 6
|
||||
+
|
||||
+#define PR_ALIGN_OF_SHORT 2
|
||||
+#define PR_ALIGN_OF_INT 4
|
||||
+#define PR_ALIGN_OF_LONG 8
|
||||
+#define PR_ALIGN_OF_INT64 8
|
||||
+#define PR_ALIGN_OF_FLOAT 4
|
||||
+#define PR_ALIGN_OF_DOUBLE 8
|
||||
+#define PR_ALIGN_OF_POINTER 8
|
||||
+#define PR_ALIGN_OF_WORD 8
|
||||
+
|
||||
+#define PR_BYTES_PER_WORD_LOG2 3
|
||||
+#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
+
|
||||
+#define HAVE_LONG_LONG
|
||||
+#define HAVE_ALIGNED_DOUBLES
|
||||
+#define HAVE_ALIGNED_LONGLONGS
|
||||
#else
|
||||
|
||||
#error "Unknown CPU architecture"
|
||||
@ -1,13 +0,0 @@
|
||||
--- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 18:36:13 2003
|
||||
+++ nsprpub/pr/include/md/_freebsd.h Sun Dec 14 11:40:08 2003
|
||||
@@ -50,6 +50,10 @@
|
||||
#define _PR_SI_ARCHITECTURE "alpha"
|
||||
#elif defined(__sparc__)
|
||||
#define _PR_SI_ARCHITECTURE "sparc"
|
||||
+#elif defined(__ia64__)
|
||||
+#define _PR_SI_ARCHITECTURE "ia64"
|
||||
+#elif defined(__amd64__)
|
||||
+#define _PR_SI_ARCHITECTURE "amd64"
|
||||
#else
|
||||
#error "Unknown CPU architecture"
|
||||
#endif
|
||||
@ -1,29 +0,0 @@
|
||||
--- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003
|
||||
+++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003
|
||||
@@ -189,7 +189,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#ifdef DARWIN
|
||||
+#if defined(DARWIN) || defined(FREEBSD)
|
||||
static PRBool _pr_ipv6_v6only_on_by_default;
|
||||
/* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
|
||||
#ifndef IPV6_V6ONLY
|
||||
@@ -1154,7 +1154,7 @@
|
||||
_pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
|
||||
PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
|
||||
|
||||
-#ifdef DARWIN
|
||||
+#if defined(DARWIN) || defined(FREEBSD)
|
||||
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
|
||||
* is turned on by default, contrary to what RFC 3493, Section
|
||||
* 5.3 says. So we have to turn it off. Find out whether we
|
||||
@@ -3462,7 +3462,7 @@
|
||||
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
|
||||
else
|
||||
{
|
||||
-#ifdef DARWIN
|
||||
+#if defined(DARWIN) || defined(FREEBSD)
|
||||
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
|
||||
{
|
||||
int on = 0;
|
||||
178
www/kompozer/files/patch-sysnss
Normal file
178
www/kompozer/files/patch-sysnss
Normal file
@ -0,0 +1,178 @@
|
||||
--- Makefile.in Tue Sep 14 16:59:40 2004
|
||||
+++ Makefile.in Tue Aug 2 08:26:55 2005
|
||||
@@ -102,6 +102,4 @@
|
||||
# tier 1 - 3rd party individual libraries
|
||||
#
|
||||
-tier_1_dirs += dbm
|
||||
-
|
||||
ifndef MOZ_NATIVE_JPEG
|
||||
tier_1_dirs += jpeg
|
||||
--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
|
||||
+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
|
||||
@@ -37,16 +37,7 @@
|
||||
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)))
|
||||
@@ -132,9 +123,4 @@
|
||||
.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 $@
|
||||
|
||||
@@ -153,43 +139,4 @@
|
||||
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 $@
|
||||
@@ -200,18 +147,4 @@
|
||||
|
||||
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 $@
|
||||
@@ -227,9 +160,4 @@
|
||||
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::
|
||||
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
|
||||
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
|
||||
@@ -117,5 +117,5 @@
|
||||
# Use local includes because they are inserted before INCLUDES
|
||||
# so that Mozilla's nss.h is used, not glibc's
|
||||
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
|
||||
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
|
||||
$(NULL)
|
||||
|
||||
--- config/config.mk Tue Oct 12 00:11:11 2004
|
||||
+++ config/config.mk Tue Aug 2 09:19:18 2005
|
||||
@@ -170,5 +170,4 @@
|
||||
NSS_LIBS = \
|
||||
$(LIBS_DIR) \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
|
||||
-lsmime3 \
|
||||
-lssl3 \
|
||||
@@ -189,11 +188,5 @@
|
||||
endif
|
||||
|
||||
-NSS_DEP_LIBS = \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
|
||||
- $(NULL)
|
||||
+NSS_DEP_LIBS =
|
||||
|
||||
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
|
||||
--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
|
||||
+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
|
||||
@@ -88,4 +88,8 @@
|
||||
}
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <errno.h>
|
||||
+
|
||||
#ifdef PR_LOGGING
|
||||
PRLogModuleInfo* gPIPNSSLog = nsnull;
|
||||
@@ -406,4 +410,5 @@
|
||||
const char *possible_ckbi_locations[] = {
|
||||
NS_GRE_DIR,
|
||||
+ NS_UNIX_LIB_DIR,
|
||||
NS_XPCOM_CURRENT_PROCESS_DIR
|
||||
};
|
||||
@@ -419,5 +424,5 @@
|
||||
}
|
||||
|
||||
- char *fullModuleName = nsnull;
|
||||
+ char *fullModuleName;
|
||||
#ifdef XP_MAC
|
||||
nsCAutoString nativePath;
|
||||
@@ -431,4 +436,12 @@
|
||||
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
|
||||
#endif
|
||||
+ if (fullModuleName == nsnull)
|
||||
+ continue;
|
||||
+ struct stat sb;
|
||||
+ if (stat(fullModuleName, &sb)) {
|
||||
+ if (errno != ENOENT)
|
||||
+ perror(fullModuleName);
|
||||
+ continue;
|
||||
+ }
|
||||
/* If a module exists with the same name, delete it. */
|
||||
NS_ConvertUCS2toUTF8 modNameUTF8(modName);
|
||||
@ -1,5 +1,3 @@
|
||||
$FreeBSD: /tmp/pcvs/ports/www/kompozer/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.3 2005-01-14 02:31:48 ahze Exp $
|
||||
|
||||
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004
|
||||
@@ -49,6 +49,9 @@
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/www/nvu/pkg-deinstall.in,v 1.1 2005/11/14 04:12:09 ahze Exp $
|
||||
#
|
||||
# Date created: Mon Nov 29, 2003
|
||||
# Whom: Thierry Thomas (<thierry@pompo.net>)
|
||||
@ -12,7 +13,7 @@ PATH=/bin:/usr/bin
|
||||
[ "x$1" = "x" ] && exit 1
|
||||
[ "x$2" != "xDEINSTALL" ] && exit 0
|
||||
|
||||
NVUDIR=%%NVUDIR%%
|
||||
NVUDIR=%%MOZDIR%%
|
||||
|
||||
rm -rf ${NVUDIR}/chrome/overlayinfo
|
||||
rm -f ${NVUDIR}/chrome/*.rdf
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/www/nvu/pkg-install.in,v 1.1 2005/11/14 04:12:09 ahze Exp $
|
||||
#
|
||||
# Date created: Mon Nov 29, 2003
|
||||
# Whom: Thierry Thomas (<thierry@pompo.net>)
|
||||
@ -12,7 +13,7 @@ PATH=/bin:/usr/bin:/usr/local/bin
|
||||
[ "x$1" = "x" ] && exit 1
|
||||
[ "x$2" != "xPOST-INSTALL" ] && exit 0
|
||||
|
||||
NVUDIR=%%NVUDIR%%
|
||||
NVUDIR=%%MOZDIR%%
|
||||
REGXPCOM=${NVUDIR}/regxpcom
|
||||
REGCHROME=${NVUDIR}/regchrome
|
||||
NVUBIN=${NVUDIR}/nvu-bin
|
||||
|
||||
111
www/nvu/Makefile
111
www/nvu/Makefile
@ -3,6 +3,7 @@
|
||||
# Whom: Thierry Thomas <thierry@pompo.net>
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $
|
||||
#
|
||||
|
||||
PORTNAME= nvu
|
||||
@ -14,125 +15,25 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources
|
||||
MAINTAINER= ahze@FreeBSD.org
|
||||
COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage
|
||||
|
||||
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
Xft.2:${PORTSDIR}/x11-fonts/libXft
|
||||
|
||||
USE_X_PREFIX= yes
|
||||
USE_BZIP2= yes
|
||||
USE_PERL5= yes
|
||||
USE_GNOME= gtk20 libidl
|
||||
USE_REINPLACE= yes
|
||||
WANT_GNOME= yes
|
||||
USE_GMAKE= yes
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||
NVU= ${PORTNAME}-${DISTVERSION}
|
||||
FAKEDIR= ${WRKDIR}/FAKE
|
||||
WRKSRC= ${WRKDIR}/mozilla
|
||||
PLIST= ${WRKDIR}/plist
|
||||
MAKEFILE= client.mk
|
||||
ALL_TARGET= build_all
|
||||
PKG_CONFIGS= nvu-gtkmozembed.pc nvu-js.pc nvu-nspr.pc \
|
||||
nvu-nss.pc nvu-plugin.pc nvu-xpcom.pc
|
||||
EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/*
|
||||
PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include "${.CURDIR}/../mozilla/Makefile.common"
|
||||
|
||||
.if ${PERL_LEVEL} < 500600
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_OPTIMIZED_CFLAGS)
|
||||
@${ECHO_MSG} "Enable -O2 optimizations by defining"
|
||||
@${ECHO_MSG} "WITH_OPTIMIZED_CFLAGS"
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
# Remove so we can actaully find programs that are not in /usr/bin
|
||||
@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
|
||||
@${SED} -e 's|%%NVUDIR%%|${PREFIX}/lib/${NVU}|g ; \
|
||||
s|%%PREFIX%%|${PREFIX}|g ; \
|
||||
s|%%X11BASE%%|${X11BASE}|g' \
|
||||
< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
|
||||
@${SED} -e 's|%%NVUDIR%%|${PREFIX}/lib/${NVU}|g' \
|
||||
< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
|
||||
@${SED} -e 's|%%CC%%|${CC}|; s|%%CXX%%|${CXX}|; \
|
||||
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|; \
|
||||
s|%%CFLAGS%%|${CFLAGS}|; \
|
||||
s|%%CXXFLAGS%%|${CXXFLAGS}|; \
|
||||
s|%%PREFIX%%|${FAKEDIR}|; \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|' \
|
||||
${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
|
||||
# Stupid workaround..
|
||||
.for f in toolkit/components/Makefile.in toolkit/components/gnome/Makefile.in
|
||||
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/${f}
|
||||
.endfor
|
||||
.if defined(WITH_DEBUG)
|
||||
@${ECHO_CMD} "ac_add_options --enable-debug" >> ${WRKSRC}/.mozconfig
|
||||
@${ECHO_CMD} "ac_add_options --disable-strip" >> ${WRKSRC}/.mozconfig
|
||||
.else
|
||||
@${ECHO_CMD} "ac_add_options --disable-debug" >> ${WRKSRC}/.mozconfig
|
||||
@${ECHO_CMD} "ac_add_options --enable-strip" >> ${WRKSRC}/.mozconfig
|
||||
.endif
|
||||
.if defined(WITH_OPTIMIZED_CFLAGS)
|
||||
@${ECHO_CMD} "ac_add_options --enable-optimize=-O2" >> ${WRKSRC}/.mozconfig
|
||||
.endif
|
||||
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
|
||||
s|-lpthread|${PTHREAD_LIBS}|g; \
|
||||
s|/usr/X11R6|${X11BASE}|g' \
|
||||
${WRKSRC}/configure \
|
||||
${WRKSRC}/nsprpub/configure
|
||||
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
|
||||
${WRKSRC}/nsprpub/configure \
|
||||
${WRKSRC}/security/coreconf/FreeBSD.mk \
|
||||
${WRKSRC}/js/src/Makefile.in
|
||||
|
||||
pre-install:
|
||||
${RM} -rf ${PLIST} ${FAKEDIR}
|
||||
${TOUCH} -f ${PLIST}
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
|
||||
${MAKEFILE} ${MAKE_ARGS} install
|
||||
${ECHO_CMD} bin/nvu >> ${PLIST}
|
||||
${ECHO_CMD} bin/nvu-config >> ${PLIST}
|
||||
cd ${FAKEDIR}/lib/${NVU} && ${FIND} -s * -type f -o -type l | \
|
||||
${SED} -e 's|^|lib/${NVU}/|' >> ${PLIST} \
|
||||
&& ${FIND} -d * -type d | \
|
||||
${SED} -e 's:^:@dirrm lib/${NVU}/:' >> ${PLIST}
|
||||
${ECHO_CMD} @dirrm lib/${NVU} >> ${PLIST}
|
||||
.for p in ${PKG_CONFIGS}
|
||||
${ECHO_CMD} ${p:S|^|libdata/pkgconfig/|} >> ${PLIST}
|
||||
.endfor
|
||||
cd ${FAKEDIR}/include/${NVU} && ${FIND} -s * -type f -o -type l | \
|
||||
${SED} -e 's|^|include/${NVU}/|' >> ${PLIST} \
|
||||
&& ${FIND} -d * -type d | \
|
||||
${SED} -e 's|^|@dirrm include/${NVU}/|' >> ${PLIST}
|
||||
${ECHO_CMD} @dirrm include/${NVU} >> ${PLIST}
|
||||
|
||||
do-install:
|
||||
${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
|
||||
${FAKEDIR}/bin/* \
|
||||
${FAKEDIR}/lib/pkgconfig/*
|
||||
${RM} -f ${FAKEDIR}/bin/*.bak ${FAKEDIR}/lib/pkgconfig/*.bak
|
||||
${MKDIR} ${PREFIX}/lib/${NVU}
|
||||
${CHMOD} 755 ${PREFIX}/lib/${NVU}
|
||||
${INSTALL_SCRIPT} ${FAKEDIR}/bin/* ${PREFIX}/bin
|
||||
if [ ! -d ${PREFIX}/libdata/pkgconfig ]; then \
|
||||
${MKDIR} ${PREFIX}/libdata/pkgconfig ; \
|
||||
fi
|
||||
.for i in ${PKG_CONFIGS}
|
||||
${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/${i} ${PREFIX}/libdata/pkgconfig/
|
||||
.endfor
|
||||
cd ${FAKEDIR}/lib/${NVU} && ${FIND} . | \
|
||||
${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${NVU}
|
||||
cd ${FAKEDIR}/include/${NVU} && ${FIND} . | \
|
||||
${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${NVU}
|
||||
|
||||
post-install:
|
||||
.if !defined(PACKAGE_BUILDING)
|
||||
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
|
||||
.endif
|
||||
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
|
||||
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export BUILD_OFFICIAL=1
|
||||
|
||||
export MOZ_STANDALONE_COMPOSER=1
|
||||
mk_add_options MOZ_STANDALONE_COMPOSER=1
|
||||
|
||||
export CC="%%CC%%"
|
||||
export CXX="%%CXX%%"
|
||||
export OS_LIBS="%%PTHREAD_LIBS%%"
|
||||
export CFLAGS="%%CFLAGS%%"
|
||||
export CXXFLAGS="%%CXXFLAGS%%"
|
||||
|
||||
ac_add_options --enable-single-profile
|
||||
ac_add_options --disable-svg
|
||||
ac_add_options --disable-ldap
|
||||
ac_add_options --disable-mailnews
|
||||
ac_add_options --disable-installer
|
||||
ac_add_options --disable-activex
|
||||
ac_add_options --disable-activex-scripting
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-oji
|
||||
ac_add_options --disable-necko-disk-cache
|
||||
ac_add_options --disable-profilesharing
|
||||
ac_add_options --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
|
||||
ac_add_options --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
|
||||
ac_add_options --disable-pedantic
|
||||
ac_add_options --disable-short-wchar
|
||||
ac_add_options --enable-xprint
|
||||
ac_add_options --enable-freetype2
|
||||
ac_add_options --enable-crypto
|
||||
ac_add_options --disable-mathml
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --enable-toolkit=gtk2
|
||||
ac_add_options --enable-default-toolkit=gtk2
|
||||
ac_add_options --enable-image-decoders=default,-xbm
|
||||
ac_add_options --with-system-jpeg=%%LOCALBASE%%
|
||||
ac_add_options --with-system-png=%%LOCALBASE%%
|
||||
ac_add_options --with-pthreads
|
||||
ac_add_options --enable-xft
|
||||
ac_add_options --prefix=%%PREFIX%%
|
||||
18
www/nvu/files/patch-config_autoconf.mk.in
Normal file
18
www/nvu/files/patch-config_autoconf.mk.in
Normal file
@ -0,0 +1,18 @@
|
||||
--- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005
|
||||
+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005
|
||||
@@ -50,13 +50,13 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
+includedir = @includedir@/%%MOZILLA%%
|
||||
libdir = @libdir@
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
|
||||
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
+mozappdir = $(libdir)/%%MOZILLA%%
|
||||
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
||||
mrelibdir = $(mredir)/lib
|
||||
|
||||
15
www/nvu/files/patch-gfx-src-gtk-Makefile.in
Normal file
15
www/nvu/files/patch-gfx-src-gtk-Makefile.in
Normal file
@ -0,0 +1,15 @@
|
||||
When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
|
||||
contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
|
||||
|
||||
This causes an error, because libgfxshared_s is only under dist/lib.
|
||||
|
||||
-mi
|
||||
|
||||
--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
|
||||
+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
|
||||
@@ -165,4 +165,5 @@
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
|
||||
+ $(LIBS_DIR) \
|
||||
-lgkgfx \
|
||||
-lgfxshared_s \
|
||||
25
www/nvu/files/patch-libm
Normal file
25
www/nvu/files/patch-libm
Normal file
@ -0,0 +1,25 @@
|
||||
--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
|
||||
+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
|
||||
@@ -148,5 +148,4 @@
|
||||
endif
|
||||
|
||||
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
|
||||
JSMATH_PRELINK = jsmathtemp.o
|
||||
JS_SAFE_ARENA = 1
|
||||
@@ -320,7 +319,4 @@
|
||||
endif
|
||||
@$(RM) -f $(JSMATH_PRELINK)
|
||||
-else
|
||||
-# Create dependency so we build fdlibm
|
||||
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
|
||||
endif
|
||||
|
||||
--- js/Makefile.in Sun Mar 23 14:36:00 2003
|
||||
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
|
||||
@@ -46,5 +46,5 @@
|
||||
#
|
||||
|
||||
-DIRS = src/fdlibm src
|
||||
+DIRS = src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
@ -1,11 +0,0 @@
|
||||
--- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004
|
||||
+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004
|
||||
@@ -90,7 +90,7 @@
|
||||
#define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init
|
||||
#define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy
|
||||
#define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a))
|
||||
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
|
||||
+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
|
||||
#if defined(DARWIN)
|
||||
#define _PT_PTHREAD_CONDATTR_INIT(x) 0
|
||||
#else
|
||||
@ -1,14 +0,0 @@
|
||||
--- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004
|
||||
+++ nsprpub/pr/src/io/prprf.c Fri Mar 19 15:26:55 2004
|
||||
@@ -51,7 +51,10 @@
|
||||
** Note: on some platforms va_list is defined as an array,
|
||||
** and requires array notation.
|
||||
*/
|
||||
-#if (defined(LINUX) && defined(__x86_64__))
|
||||
+#if defined(__amd64__)
|
||||
+#include <stdarg.h>
|
||||
+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
|
||||
+#elif (defined(LINUX) && defined(__x86_64__))
|
||||
#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
|
||||
#elif (defined(LINUX) && defined(__powerpc__)) || \
|
||||
(defined(LINUX) && defined(__s390__)) || \
|
||||
@ -1,124 +0,0 @@
|
||||
--- nsprpub/pr/include/md/_freebsd.cfg.orig Sat Nov 15 15:36:12 2003
|
||||
+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 13:36:44 2004
|
||||
@@ -91,7 +91,7 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 4
|
||||
#define PR_ALIGN_OF_POINTER 4
|
||||
|
||||
-#elif defined(__alpha)
|
||||
+#elif defined(__alpha__)
|
||||
|
||||
#define IS_LITTLE_ENDIAN 1
|
||||
#undef IS_BIG_ENDIAN
|
||||
@@ -138,8 +138,7 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 8
|
||||
#define PR_ALIGN_OF_POINTER 8
|
||||
|
||||
-#elif defined(__sparc__)
|
||||
-
|
||||
+#elif defined(__sparc64__)
|
||||
#undef IS_LITTLE_ENDIAN
|
||||
#define IS_BIG_ENDIAN 1
|
||||
#define HAVE_LONG_LONG
|
||||
@@ -185,6 +184,102 @@
|
||||
#define PR_ALIGN_OF_DOUBLE 8
|
||||
#define PR_ALIGN_OF_POINTER 8
|
||||
|
||||
+#elif defined(__ia64__)
|
||||
+#define IS_LITTLE_ENDIAN 1
|
||||
+#undef IS_BIG_ENDIAN
|
||||
+#define HAVE_LONG_LONG
|
||||
+#define HAVE_ALIGNED_DOUBLES
|
||||
+#define HAVE_ALIGNED_LONGLONGS
|
||||
+#define IS_64
|
||||
+
|
||||
+#define PR_BYTES_PER_BYTE 1
|
||||
+#define PR_BYTES_PER_SHORT 2
|
||||
+#define PR_BYTES_PER_INT 4
|
||||
+#define PR_BYTES_PER_INT64 8
|
||||
+#define PR_BYTES_PER_LONG 8
|
||||
+#define PR_BYTES_PER_FLOAT 4
|
||||
+#define PR_BYTES_PER_DOUBLE 8
|
||||
+#define PR_BYTES_PER_WORD 8
|
||||
+#define PR_BYTES_PER_DWORD 8
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE 8
|
||||
+#define PR_BITS_PER_SHORT 16
|
||||
+#define PR_BITS_PER_INT 32
|
||||
+#define PR_BITS_PER_INT64 64
|
||||
+#define PR_BITS_PER_LONG 64
|
||||
+#define PR_BITS_PER_FLOAT 32
|
||||
+#define PR_BITS_PER_DOUBLE 64
|
||||
+#define PR_BITS_PER_WORD 64
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE_LOG2 3
|
||||
+#define PR_BITS_PER_SHORT_LOG2 4
|
||||
+#define PR_BITS_PER_INT_LOG2 5
|
||||
+#define PR_BITS_PER_INT64_LOG2 6
|
||||
+#define PR_BITS_PER_LONG_LOG2 6
|
||||
+#define PR_BITS_PER_FLOAT_LOG2 5
|
||||
+#define PR_BITS_PER_DOUBLE_LOG2 6
|
||||
+#define PR_BITS_PER_WORD_LOG2 6
|
||||
+
|
||||
+#define PR_ALIGN_OF_SHORT 2
|
||||
+#define PR_ALIGN_OF_INT 4
|
||||
+#define PR_ALIGN_OF_LONG 8
|
||||
+#define PR_ALIGN_OF_INT64 8
|
||||
+#define PR_ALIGN_OF_FLOAT 4
|
||||
+#define PR_ALIGN_OF_DOUBLE 8
|
||||
+#define PR_ALIGN_OF_POINTER 8
|
||||
+#define PR_ALIGN_OF_WORD 8
|
||||
+
|
||||
+#define PR_BYTES_PER_WORD_LOG2 3
|
||||
+#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
+
|
||||
+#elif defined(__amd64__)
|
||||
+#define IS_LITTLE_ENDIAN 1
|
||||
+#undef IS_BIG_ENDIAN
|
||||
+#define IS_64
|
||||
+
|
||||
+#define PR_BYTES_PER_BYTE 1
|
||||
+#define PR_BYTES_PER_SHORT 2
|
||||
+#define PR_BYTES_PER_INT 4
|
||||
+#define PR_BYTES_PER_INT64 8
|
||||
+#define PR_BYTES_PER_LONG 8
|
||||
+#define PR_BYTES_PER_FLOAT 4
|
||||
+#define PR_BYTES_PER_DOUBLE 8
|
||||
+#define PR_BYTES_PER_WORD 8
|
||||
+#define PR_BYTES_PER_DWORD 8
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE 8
|
||||
+#define PR_BITS_PER_SHORT 16
|
||||
+#define PR_BITS_PER_INT 32
|
||||
+#define PR_BITS_PER_INT64 64
|
||||
+#define PR_BITS_PER_LONG 64
|
||||
+#define PR_BITS_PER_FLOAT 32
|
||||
+#define PR_BITS_PER_DOUBLE 64
|
||||
+#define PR_BITS_PER_WORD 64
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE_LOG2 3
|
||||
+#define PR_BITS_PER_SHORT_LOG2 4
|
||||
+#define PR_BITS_PER_INT_LOG2 5
|
||||
+#define PR_BITS_PER_INT64_LOG2 6
|
||||
+#define PR_BITS_PER_LONG_LOG2 6
|
||||
+#define PR_BITS_PER_FLOAT_LOG2 5
|
||||
+#define PR_BITS_PER_DOUBLE_LOG2 6
|
||||
+#define PR_BITS_PER_WORD_LOG2 6
|
||||
+
|
||||
+#define PR_ALIGN_OF_SHORT 2
|
||||
+#define PR_ALIGN_OF_INT 4
|
||||
+#define PR_ALIGN_OF_LONG 8
|
||||
+#define PR_ALIGN_OF_INT64 8
|
||||
+#define PR_ALIGN_OF_FLOAT 4
|
||||
+#define PR_ALIGN_OF_DOUBLE 8
|
||||
+#define PR_ALIGN_OF_POINTER 8
|
||||
+#define PR_ALIGN_OF_WORD 8
|
||||
+
|
||||
+#define PR_BYTES_PER_WORD_LOG2 3
|
||||
+#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
+
|
||||
+#define HAVE_LONG_LONG
|
||||
+#define HAVE_ALIGNED_DOUBLES
|
||||
+#define HAVE_ALIGNED_LONGLONGS
|
||||
#else
|
||||
|
||||
#error "Unknown CPU architecture"
|
||||
@ -1,13 +0,0 @@
|
||||
--- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 18:36:13 2003
|
||||
+++ nsprpub/pr/include/md/_freebsd.h Sun Dec 14 11:40:08 2003
|
||||
@@ -50,6 +50,10 @@
|
||||
#define _PR_SI_ARCHITECTURE "alpha"
|
||||
#elif defined(__sparc__)
|
||||
#define _PR_SI_ARCHITECTURE "sparc"
|
||||
+#elif defined(__ia64__)
|
||||
+#define _PR_SI_ARCHITECTURE "ia64"
|
||||
+#elif defined(__amd64__)
|
||||
+#define _PR_SI_ARCHITECTURE "amd64"
|
||||
#else
|
||||
#error "Unknown CPU architecture"
|
||||
#endif
|
||||
@ -1,29 +0,0 @@
|
||||
--- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003
|
||||
+++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003
|
||||
@@ -189,7 +189,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#ifdef DARWIN
|
||||
+#if defined(DARWIN) || defined(FREEBSD)
|
||||
static PRBool _pr_ipv6_v6only_on_by_default;
|
||||
/* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
|
||||
#ifndef IPV6_V6ONLY
|
||||
@@ -1154,7 +1154,7 @@
|
||||
_pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
|
||||
PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
|
||||
|
||||
-#ifdef DARWIN
|
||||
+#if defined(DARWIN) || defined(FREEBSD)
|
||||
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
|
||||
* is turned on by default, contrary to what RFC 3493, Section
|
||||
* 5.3 says. So we have to turn it off. Find out whether we
|
||||
@@ -3462,7 +3462,7 @@
|
||||
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
|
||||
else
|
||||
{
|
||||
-#ifdef DARWIN
|
||||
+#if defined(DARWIN) || defined(FREEBSD)
|
||||
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
|
||||
{
|
||||
int on = 0;
|
||||
178
www/nvu/files/patch-sysnss
Normal file
178
www/nvu/files/patch-sysnss
Normal file
@ -0,0 +1,178 @@
|
||||
--- Makefile.in Tue Sep 14 16:59:40 2004
|
||||
+++ Makefile.in Tue Aug 2 08:26:55 2005
|
||||
@@ -102,6 +102,4 @@
|
||||
# tier 1 - 3rd party individual libraries
|
||||
#
|
||||
-tier_1_dirs += dbm
|
||||
-
|
||||
ifndef MOZ_NATIVE_JPEG
|
||||
tier_1_dirs += jpeg
|
||||
--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
|
||||
+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
|
||||
@@ -37,16 +37,7 @@
|
||||
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)))
|
||||
@@ -132,9 +123,4 @@
|
||||
.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 $@
|
||||
|
||||
@@ -153,43 +139,4 @@
|
||||
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 $@
|
||||
@@ -200,18 +147,4 @@
|
||||
|
||||
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 $@
|
||||
@@ -227,9 +160,4 @@
|
||||
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::
|
||||
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
|
||||
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
|
||||
@@ -117,5 +117,5 @@
|
||||
# Use local includes because they are inserted before INCLUDES
|
||||
# so that Mozilla's nss.h is used, not glibc's
|
||||
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
|
||||
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
|
||||
$(NULL)
|
||||
|
||||
--- config/config.mk Tue Oct 12 00:11:11 2004
|
||||
+++ config/config.mk Tue Aug 2 09:19:18 2005
|
||||
@@ -170,5 +170,4 @@
|
||||
NSS_LIBS = \
|
||||
$(LIBS_DIR) \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
|
||||
-lsmime3 \
|
||||
-lssl3 \
|
||||
@@ -189,11 +188,5 @@
|
||||
endif
|
||||
|
||||
-NSS_DEP_LIBS = \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
|
||||
- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
|
||||
- $(NULL)
|
||||
+NSS_DEP_LIBS =
|
||||
|
||||
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
|
||||
--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
|
||||
+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
|
||||
@@ -88,4 +88,8 @@
|
||||
}
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <errno.h>
|
||||
+
|
||||
#ifdef PR_LOGGING
|
||||
PRLogModuleInfo* gPIPNSSLog = nsnull;
|
||||
@@ -406,4 +410,5 @@
|
||||
const char *possible_ckbi_locations[] = {
|
||||
NS_GRE_DIR,
|
||||
+ NS_UNIX_LIB_DIR,
|
||||
NS_XPCOM_CURRENT_PROCESS_DIR
|
||||
};
|
||||
@@ -419,5 +424,5 @@
|
||||
}
|
||||
|
||||
- char *fullModuleName = nsnull;
|
||||
+ char *fullModuleName;
|
||||
#ifdef XP_MAC
|
||||
nsCAutoString nativePath;
|
||||
@@ -431,4 +436,12 @@
|
||||
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
|
||||
#endif
|
||||
+ if (fullModuleName == nsnull)
|
||||
+ continue;
|
||||
+ struct stat sb;
|
||||
+ if (stat(fullModuleName, &sb)) {
|
||||
+ if (errno != ENOENT)
|
||||
+ perror(fullModuleName);
|
||||
+ continue;
|
||||
+ }
|
||||
/* If a module exists with the same name, delete it. */
|
||||
NS_ConvertUCS2toUTF8 modNameUTF8(modName);
|
||||
@ -1,5 +1,3 @@
|
||||
$FreeBSD: /tmp/pcvs/ports/www/nvu/files/Attic/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.3 2005-01-14 02:31:48 ahze Exp $
|
||||
|
||||
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004
|
||||
@@ -49,6 +49,9 @@
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/www/nvu/pkg-deinstall.in,v 1.1 2005/11/14 04:12:09 ahze Exp $
|
||||
#
|
||||
# Date created: Mon Nov 29, 2003
|
||||
# Whom: Thierry Thomas (<thierry@pompo.net>)
|
||||
@ -12,7 +13,7 @@ PATH=/bin:/usr/bin
|
||||
[ "x$1" = "x" ] && exit 1
|
||||
[ "x$2" != "xDEINSTALL" ] && exit 0
|
||||
|
||||
NVUDIR=%%NVUDIR%%
|
||||
NVUDIR=%%MOZDIR%%
|
||||
|
||||
rm -rf ${NVUDIR}/chrome/overlayinfo
|
||||
rm -f ${NVUDIR}/chrome/*.rdf
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/www/nvu/pkg-install.in,v 1.1 2005/11/14 04:12:09 ahze Exp $
|
||||
#
|
||||
# Date created: Mon Nov 29, 2003
|
||||
# Whom: Thierry Thomas (<thierry@pompo.net>)
|
||||
@ -12,7 +13,7 @@ PATH=/bin:/usr/bin:/usr/local/bin
|
||||
[ "x$1" = "x" ] && exit 1
|
||||
[ "x$2" != "xPOST-INSTALL" ] && exit 0
|
||||
|
||||
NVUDIR=%%NVUDIR%%
|
||||
NVUDIR=%%MOZDIR%%
|
||||
REGXPCOM=${NVUDIR}/regxpcom
|
||||
REGCHROME=${NVUDIR}/regchrome
|
||||
NVUBIN=${NVUDIR}/nvu-bin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user