ports/160444: www/seamonkey fails to build ...

[Riccardo Torrini]

The following reply was made to PR ports/160444; it has been noted by GNATS.

From: Riccardo Torrini <riccardo at torrini.org>
To: bug-followup at FreeBSD.org, Joe Altman <freebsd-announce at chthonic.com>
Cc: Alexey Shuvaev <shuvaev at physik.uni-wuerzburg.de>,
	Nali Toja <nalitoja at gmail.com>
Subject: Re: ports/160444: www/seamonkey fails to build ...
Date: Sat, 26 Nov 2011 15:53:15 +0100

 ... again  :-)
 
 Trying to update from 2.4.1 to 2.5 with all knobs disabled fail
 to apply patch "extra-patch-bridge-bridge.mk" because actual
 bridge.mk has 4 more lines in the middle of the lines changed:
 
 -----8<-----
 46  #ifdef MOZ_MORK
 47  APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
 48  #endif
 49  
 -----8<-----
 
 I manually changed extra-patch-bridge-bridge.mk, inserting that
 four lines and changing header ( s/12/16/g, see below ).
 This way it compiles and run even with all know disabled.
 
 ===>   Registering installation for seamonkey-2.5
 [...]
 ===>>> Upgrade of seamonkey-2.4.1 to seamonkey-2.5 complete
 Build identifier: Mozilla/5.0 (X11; FreeBSD i386; rv:8.0.1) Gecko/20111126 Firefox/8.0.1 SeaMonkey/2.5
 
 
 -----8<-----
 cd /usr/ports/www/seamonkey
 diff -u4 files/*extra-mailnews-patch-bridge-bridge.mk
 --- files/BAD_extra-mailnews-patch-bridge-bridge.mk     2011-10-26 23:11:40.000000000 +0200
 +++ files/extra-mailnews-patch-bridge-bridge.mk 2011-11-26 14:10:12.000000000 +0100
 @@ -1,7 +1,7 @@
  --- bridge/bridge.mk.orig      2011-09-29 01:10:49.000000000 +0200
  +++ bridge/bridge.mk   2011-10-26 22:21:47.000000000 +0200
 -@@ -38,12 +38,12 @@
 +@@ -38,16 +38,16 @@
   
   APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
   
  -#ifdef MOZ_LDAP_XPCOM
 @@ -10,8 +10,12 @@
   APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
  -#endif
  +endif
   
 + #ifdef MOZ_MORK
 + APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
 + #endif
 +
  -ifdef MOZ_MAIL_NEWS
  +ifdef disabled
   APP_LIBXUL_DIRS += \
     $(DEPTH)$(SUBDIR)/mailnews/base \
 -----8<-----
 
 
 Not sure if a new PR is needed, let me know.
 
 
 -- 
 Riccardo.