Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv543
Modified Files:
seamonkey.info seamonkey.patch
Log Message:
cleanup _ including precomp stuff.
Hoping that anybody is allowed to fix also nobody's pkgs in addition to his own
:)
Index: seamonkey.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seamonkey.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- seamonkey.info 11 Jan 2007 19:12:51 -0000 1.7
+++ seamonkey.info 13 Jan 2007 03:41:14 -0000 1.8
@@ -24,8 +24,19 @@
PatchScript: <<
#!/bin/sh -ev
+## someone should once re-generate this old patch-file, going back to the
early mozilla versions, and that I've only edited since..
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
- perl -pi.bak -e 's,[EMAIL PROTECTED],%p/lib/%N,' security/coreconf/Darwin.mk
+## next 4 points substitute a.o. for things from msek's old patchscript _
trying slowly to move to more 'literate programmimg' :):
+# there should be a better way to make @executable_path work correctly, but
didn't look at it yet...
+ perl -pi.bak -e 's,(install_name|dylib_file) [EMAIL PROTECTED],\1 %p/lib/%N,'
\
+ config/{config,rules}.mk {nsprpub,directory/c-sdk}/configure{,/in}
security/coreconf/Darwin.mk \
+ security/nss/{cmd/platlibs,lib/s{mime,sl}/config}.mk
+# if we were to use --enable-prebinding, then:
+ perl -pi -e 's,LD_SEG_ADDR_TABLE=.*,LD_PREBIND_ALLOW_OVERLAP=1,'
config/config.mk
+# remove obsolete flags:
+ perl -pi.bak -e 's, \-fpascal\-strings,,; s, \-no\-cpp\-precomp,,'
{,directory/c-sdk/,nsprpub/}configure{,.in} security/coreconf/Darwin.mk
xpfe/global/buildconfig.html
+# we want a gtk2 build:
+ perl -pi -e 's, \-DXP_MACOSX \-DNO_X11,,' configure configure.in
### fix for automake1.9 stricter parsing. Remove when moving to gecko1.9
(seamonkey1.5) or higher
perl -pi.bak -e 's/(AC_DEFUN\()([^[,]+)(,)/\1\[\2]\3/'
{{build,directory/c-sdk/config}/autoconf,nsprpub/config}/nspr.m4
### The next appears needed eg when building yelp...
@@ -101,10 +112,12 @@
then
export PATH=%p/lib/freetype219/bin:$PATH
export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
- export
CPATH=%p/lib/freetype219/include:%p/lib/freetype219/include/freetype2:%p/lib/pango-ft219/include/pango-1.0:/usr/X11R6/include:%p/include
- export
LIBRARY_PATH=%p/lib/freetype219/lib:%p/lib/pango-ft219/lib:/usr/X11R6/lib:%p/lib
- export CPPFLAGS="-I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2"
- export LDFLAGS="-L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib"
+# export
CPATH=%p/lib/freetype219/include:%p/lib/freetype219/include/freetype2:%p/lib/pango-ft219/include/pango-1.0:/usr/X11R6/include:%p/include
+ export CPATH=/usr/X11R6/include:%p/include
+# export
LIBRARY_PATH=%p/lib/freetype219/lib:%p/lib/pango-ft219/lib:/usr/X11R6/lib:%p/lib
+ export LIBRARY_PATH=/usr/X11R6/lib:%p/lib
+# export CPPFLAGS="-I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2"
+# export LDFLAGS="-L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib"
else
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%p/lib/freetype219/lib/pkgconfig
export CPATH=/usr/X11R6/include:%p/include
Index: seamonkey.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seamonkey.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- seamonkey.patch 11 Jan 2007 19:12:51 -0000 1.2
+++ seamonkey.patch 13 Jan 2007 03:41:14 -0000 1.3
@@ -32,62 +32,6 @@
mrelibdir = $(mredir)/lib
DIST = $(DEPTH)/dist
-diff -Naur mozilla-1.7.2.old/config/config.mk
mozilla-1.7.2.new/config/config.mk
---- mozilla-1.7.2.old/config/config.mk Sun Apr 11 07:51:37 2004
-+++ mozilla-1.7.2.new/config/config.mk Fri Aug 20 20:36:42 2004
-@@ -702,7 +702,7 @@
- ifeq ($(OS_ARCH),Darwin)
- ifdef USE_PREBINDING
- export LD_PREBIND=1
--export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir);
pwd)/config/prebind-address-table
-+export LD_PREBIND_ALLOW_OVERLAP=1
- endif # USE_PREBINDING
- PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
- PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build
-@@ -747,7 +747,7 @@
- # Tell the linker where NSS is, if we're building crypto
- ifeq ($(OS_ARCH),Darwin)
- ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
--MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%,
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file
@executable_path/$(library):$(DIST)/bin/$(library))
-+MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%,
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file
@PREFIX@/lib/seamonkey/$(library):$(DIST)/bin/$(library))
- endif
- endif
- endif
-diff -Naur mozilla-1.7.2.old/config/rules.mk mozilla-1.7.2.new/config/rules.mk
---- mozilla-1.7.2.old/config/rules.mk Wed May 5 22:44:22 2004
-+++ mozilla-1.7.2.new/config/rules.mk Fri Aug 20 20:07:48 2004
-@@ -420,7 +420,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -bundle
- else
--EXTRA_DSO_LDOPTS += -dynamiclib -install_name
@executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
-+EXTRA_DSO_LDOPTS += -dynamiclib -install_name
$(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
- endif
- endif
- endif
-diff -Naur mozilla-1.7.2.old/configure mozilla-1.7.2.new/configure
---- mozilla-1.7.2.old/configure Sun Jun 6 03:44:52 2004
-+++ mozilla-1.7.2.new/configure Sat Aug 21 03:41:21 2004
-@@ -4976,7 +4976,7 @@
- ;;
-
- *-darwin*)
-- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
- HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
- ;;
-@@ -5207,8 +5207,8 @@
-
- *-darwin*)
- _PEDANTIC=
-- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
-- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
-+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
- DLL_SUFFIX=".dylib"
- DSO_LDOPTS=''
- STRIP="$STRIP -x -S"
diff -Naur mozilla-1.7.2.old/directory/c-sdk/config/config.mk
mozilla-1.7.2.new/directory/c-sdk/config/config.mk
--- mozilla-1.7.2.old/directory/c-sdk/config/config.mk Mon Feb 24 00:54:18 2003
+++ mozilla-1.7.2.new/directory/c-sdk/config/config.mk Fri Aug 20 20:07:48 2004
@@ -106,18 +50,6 @@
# For purify
NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
$(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-diff -Naur mozilla-1.7.2.old/directory/c-sdk/configure
mozilla-1.7.2.new/directory/c-sdk/configure
---- mozilla-1.7.2.old/directory/c-sdk/configure Fri Mar 26 10:23:41 2004
-+++ mozilla-1.7.2.new/directory/c-sdk/configure Fri Aug 20 20:07:48 2004
-@@ -3401,7 +3401,7 @@
- CPU_ARCH=ppc
- ;;
- esac
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @PREFIX@/lib/seamonkey/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-address.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-address.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-address.desktop Thu Jan
1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-address.desktop Sun Aug
22 21:36:12 2004
@@ -409,15 +341,6 @@
diff -Naur mozilla-1.7.2.old/nsprpub/configure
mozilla-1.7.2.new/nsprpub/configure
--- mozilla-1.7.2.old/nsprpub/configure Sat Apr 17 07:28:02 2004
+++ mozilla-1.7.2.new/nsprpub/configure Fri Aug 20 20:13:54 2004
-@@ -3305,7 +3305,7 @@
- CPU_ARCH=ppc
- fi
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @PREFIX@/lib/seamonkey/$@ -headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
@@ -3320,9 +3320,6 @@
# Add Mac OS X support for loading CFM & CFBundle plugins
@@ -479,42 +402,6 @@
#endif
#ifdef XP_PC
-diff -Naur mozilla-1.7.2.old/security/nss/cmd/platlibs.mk
mozilla-1.7.2.new/security/nss/cmd/platlibs.mk
---- mozilla-1.7.2.old/security/nss/cmd/platlibs.mk Sun Apr 20 13:23:14 2003
-+++ mozilla-1.7.2.new/security/nss/cmd/platlibs.mk Fri Aug 20 20:07:54 2004
-@@ -195,7 +195,7 @@
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file
@PREFIX@/lib/seamonkey/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
-
-diff -Naur mozilla-1.7.2.old/security/nss/lib/smime/config.mk
mozilla-1.7.2.new/security/nss/lib/smime/config.mk
---- mozilla-1.7.2.old/security/nss/lib/smime/config.mk Sun Apr 20 13:23:33 2003
-+++ mozilla-1.7.2.new/security/nss/lib/smime/config.mk Fri Aug 20 20:07:54 2004
-@@ -70,7 +70,7 @@
- $(NULL)
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file
@PREFIX@/lib/seamonkey/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- endif
-diff -Naur mozilla-1.7.2.old/security/nss/lib/ssl/config.mk
mozilla-1.7.2.new/security/nss/lib/ssl/config.mk
---- mozilla-1.7.2.old/security/nss/lib/ssl/config.mk Sun Apr 20 13:23:37 2003
-+++ mozilla-1.7.2.new/security/nss/lib/ssl/config.mk Fri Aug 20 20:07:54 2004
-@@ -75,7 +75,7 @@
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file
@PREFIX@/lib/seamonkey/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- endif
diff -Naur mozilla-1.7.2.old/themes/Makefile.in
mozilla-1.7.2.new/themes/Makefile.in
--- mozilla-1.7.2.old/themes/Makefile.in Thu Sep 25 21:48:58 2003
+++ mozilla-1.7.2.new/themes/Makefile.in Fri Aug 20 20:07:54 2004
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
