diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-27 03:07:09 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-27 03:07:09 +0800 |
| commit | 073b731b40bba5987ced7588ffa8788883a060e9 (patch) | |
| tree | b24f29f22c4a59be1f3a3a161546287ff81de6fe /www/mozilla/files/patch-sysnspr | |
| parent | 97fb767ed781bd5ea52c4e6ae7dca3d3dc2023a3 (diff) | |
| download | marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.gz marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.bz2 marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.lz marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.xz marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.tar.zst marcuscom-ports-073b731b40bba5987ced7588ffa8788883a060e9.zip | |
Mark CONFLICTS with xulrunner
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11188 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/mozilla/files/patch-sysnspr')
| -rw-r--r-- | www/mozilla/files/patch-sysnspr | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/www/mozilla/files/patch-sysnspr b/www/mozilla/files/patch-sysnspr new file mode 100644 index 000000000..19e2703b4 --- /dev/null +++ b/www/mozilla/files/patch-sysnspr @@ -0,0 +1,21 @@ +--- directory/c-sdk/ldap/include/Makefile.in.orig Sat Aug 20 02:15:05 2005 ++++ directory/c-sdk/ldap/include/Makefile.in Sat Aug 20 02:15:55 2005 +@@ -76,7 +76,6 @@ + $(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR) + $(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR) + rm -rf $(NSPRINCDIR)/* +- cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR) + + $(INCLUDEDIR): FORCE + $(NSINSTALL) -D $(INCLUDEDIR) +--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig Sat Aug 20 02:14:33 2005 ++++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in Sat Aug 20 02:14:39 2005 +@@ -58,7 +58,7 @@ + + LOCAL_INCLUDES = -I$(PUBLIC)/nspr + INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \ +- -I$(DIST)/include/nspr ++ $(shell nspr-config --cflags) + DEFINES += $(DEFS) + + PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS |