firefox24/xulrunner24 sdk issues

[Richard PALO <richard%netbsd.org@localhost>]

Came across the following:
> richard@dev32:/home/richard$ pfexec pkg_admin check
> ..................pkg_admin: xulrunner24-24.6.0: Symlink `/opt/local/lib/xulrunner24/libmozglue.a' exists and is in +CONTENTS but target does not exist!
> pkg_admin: xulrunner24-24.6.0: Symlink `/opt/local/lib/xulrunner24/libunicharutil_external_s.a' exists and is in +CONTENTS but target does not exist!
> pkg_admin: xulrunner24-24.6.0: Symlink `/opt/local/lib/xulrunner24/libxpcomglue.a' exists and is in +CONTENTS but target does not exist!
> pkg_admin: xulrunner24-24.6.0: Symlink `/opt/local/lib/xulrunner24/libxpcomglue_s.a' exists and is in +CONTENTS but target does not exist!
> ...

This is because of the following in xulrunner24/Makefile:
> post-install:
> 	rm -f ${DESTDIR}${PREFIX}/lib/xulrunner24/libxpcomglue.a
> 	ln -s sdk/lib/libxpcomglue.a 					\
> 	  ${DESTDIR}${PREFIX}/lib/xulrunner24/libxpcomglue.a
> 	rm -f ${DESTDIR}${PREFIX}/lib/xulrunner24/libxpcomglue_s.a
> 	ln -s sdk/lib/libxpcomglue_s.a 					\
> 	  ${DESTDIR}${PREFIX}/lib/xulrunner24/libxpcomglue_s.a
> 	rm -f ${DESTDIR}${PREFIX}/lib/xulrunner24/libunicharutil_external_s.a
> 	ln -s sdk/lib/libunicharutil_external_s.a 			\
> 	  ${DESTDIR}${PREFIX}/lib/xulrunner24/libunicharutil_external_s.a
> 	rm -f ${DESTDIR}${PREFIX}/lib/xulrunner24/libmozglue.a
> 	ln -s sdk/lib/libmozglue.a 					\
> 	  ${DESTDIR}${PREFIX}/lib/xulrunner24/libmozglue.a
> 	${TOUCH} ${TOUCH_FLAGS} ${DESTDIR}${PREFIX}/include/xulrunner24/mozilla/throw_gcc.h

Unfortunately, in firefox24/patches/patch-config_baseconfig.mk:
> --- config/baseconfig.mk.orig	2013-01-04 23:44:28.000000000 +0000
> +++ config/baseconfig.mk
> @@ -1,9 +1,9 @@
>  INCLUDED_AUTOCONF_MK = 1
>  
> -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
> +includedir := $(includedir)/${MOZILLA_PKG_NAME}
> +idldir = $(datadir)/idl/${MOZILLA_PKG_NAME}
> +installdir = $(libdir)/${MOZILLA_PKG_NAME}
> +sdkdir = $(libdir)/${MOZILLA_PKG_NAME}-sdk
>  DIST = $(DEPTH)/dist
=========================================^^^^
Indeed,  xulrunner24 installs parallel to lib/xulrunner24 the directory
lib/xulrunner24-sdk

But as indicated, the 'ln -s' expects the sdk to be in the sdk
'subdirectory'.

The same holds true for firefox24 but its Makefile doesn't do any
postinstall magic so no issue is signaled with pkg_admin check.

I believe there are [at least] two possibilities here:
1. keep the parallel structure and fix the symlinking, or
2. effectively make the sdk directory a subdirectory instead of a
parallel directory.