Date: Fri, 17 Apr 1998 14:34:23 -0700 (PDT) From: asami@FreeBSD.org (Satoshi Asami) To: garyj@muc.de Cc: cvs-ports@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/www/mozilla/patches patch-ad Message-ID: <199804172134.OAA03361@vader.cs.berkeley.edu> In-Reply-To: <199804172017.WAA14385@peedub.muc.de> (message from Gary Jennejohn on Fri, 17 Apr 1998 22:17:08 %2B0200)
next in thread | previous in thread | raw e-mail | index | archive | help
* could it be because the port is actually using gmake and make isn't
* passing its environment ?
Really, I wouldn't miss something *that* obvious. mozilla is not the
only port using gmake you know. :)
Anyway, the problem is solved, but I guess Justin is still busy so I'm
going to attach a patch I sent to him here. It was config/FreeBSD.mk
actually DELETING the definition of MOTIFLIB. (What the hell the
person who wrote that was thinking, I have absolutely no bleeping idea.)
Satoshi
-------
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/www/mozilla/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 1998/04/17 10:36:45 1.23
+++ Makefile 1998/04/17 11:01:59
@@ -26,8 +26,6 @@
OSVER= `uname -r | ${SED} 's/-.*//'`
OBJDIR= ${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
-post-configure:
- @${ECHO} ${MOTIFLIB} > ${WRKSRC}/MOTIFLIB
do-install:
@${MKDIR} ${PREFIX}/lib/mozilla/bin
@cd ${OBJDIR}/bin && tar -chf - bsdecho lib* moz-export \
Index: patches/patch-ad
===================================================================
RCS file: /usr/cvs/ports/www/mozilla/patches/patch-ad,v
retrieving revision 1.4
diff -u -r1.4 patch-ad
--- patch-ad 1998/04/17 09:29:25 1.4
+++ patch-ad 1998/04/17 10:56:17
@@ -5,6 +5,6 @@
# FreeBSD
ifeq ($(OS_ARCH),FreeBSD)
-OTHER_LIBS = /usr/X11R6/lib/libXm.a -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
-+OTHER_LIBS = `cat ../../MOTIFLIB` -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
++OTHER_LIBS = ${MOTIFLIB} -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
endif
Index: patches/patch-ah
===================================================================
RCS file: /usr/cvs/ports/www/mozilla/patches/patch-ah,v
retrieving revision 1.1
diff -u -r1.1 patch-ah
--- patch-ah 1998/04/14 21:01:55 1.1
+++ patch-ah 1998/04/17 11:32:45
@@ -1,6 +1,23 @@
*** config/FreeBSD.mk.orig Thu Apr 9 04:53:23 1998
--- config/FreeBSD.mk Wed Apr 15 00:52:41 1998
***************
+*** 31,37 ****
+ G++INCLUDES = -I/usr/include/g++
+ LOC_LIB_DIR =
+ MOTIF =
+! MOTIFLIB =
+ OS_LIBS =
+
+ # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
+--- 31,37 ----
+ G++INCLUDES = -I/usr/include/g++
+ LOC_LIB_DIR =
+ MOTIF =
+! #MOTIFLIB =
+ OS_LIBS =
+
+ # Don't define BSD, because it's already defined in /usr/include/sys/param.h.
+***************
*** 44,59 ****
OS_CFLAGS = $(PLATFORM_FLAGS) $(PORT_FLAGS) $(MOVEMAIL_FLAGS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199804172134.OAA03361>