Date: Fri, 11 Jan 2013 16:48:10 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310240 - in head/www/seamonkey: . files Message-ID: <201301111648.r0BGmAan065693@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Fri Jan 11 16:48:10 2013 New Revision: 310240 URL: http://svnweb.freebsd.org/changeset/ports/310240 Log: Only try patching enigmail when the option is selected. This fixed the build with the enigmail option disabled. Added: head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile - copied unchanged from r310232, head/www/seamonkey/files/patch-enigmail-ipc-src-Makefile Deleted: head/www/seamonkey/files/patch-enigmail-ipc-src-Makefile Modified: head/www/seamonkey/Makefile Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Fri Jan 11 15:58:31 2013 (r310239) +++ head/www/seamonkey/Makefile Fri Jan 11 16:48:10 2013 (r310240) @@ -104,6 +104,7 @@ EM_ID= ${PORTNAME}@mozilla-enigmail.org EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile .endif .endif Copied: head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile (from r310232, head/www/seamonkey/files/patch-enigmail-ipc-src-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Fri Jan 11 16:48:10 2013 (r310240, copy of r310232, head/www/seamonkey/files/patch-enigmail-ipc-src-Makefile) @@ -0,0 +1,90 @@ +--- mailnews/extensions/enigmail/ipc/src/Makefile.enig~ ++++ mailnews/extensions/enigmail/ipc/src/Makefile.enig +@@ -19,26 +19,26 @@ endif + + ifeq ($(OS_ARCH),NetBSD) + ifeq ($(DLL_SUFFIX),.so.1.0) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),FreeBSD) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + + ifeq ($(OS_ARCH),HP-UX) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),OSF1) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -B symbolic ++LDFLAGS += -shared -B symbolic + CFLAGS += -fPIC + endif + endif +@@ -62,7 +62,11 @@ libs: source + $(CC) $(LDFLAGS) -o $(libname) $(objfiles) + + source: $(source) ++ifneq (,$(filter 4.2.%, $(CC_VERSION))) ++ $(CC) $(CFLAGS) -c -o $(objfiles) $^ ++else + $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ ++endif + + + clean: +--- mailnews/extensions/enigmail/ipc/src/Makefile.in~ ++++ mailnews/extensions/enigmail/ipc/src/Makefile.in +@@ -19,26 +19,26 @@ endif + + ifeq ($(OS_ARCH),NetBSD) + ifeq ($(DLL_SUFFIX),.so.1.0) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),FreeBSD) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + + ifeq ($(OS_ARCH),HP-UX) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),OSF1) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -B symbolic ++LDFLAGS += -shared -B symbolic + CFLAGS += -fPIC + endif + endif +@@ -62,7 +62,11 @@ libs: source + $(CC) $(LDFLAGS) -o $(libname) $(objfiles) + + source: $(source) ++ifneq (,$(filter 4.2.%, $(CC_VERSION))) ++ $(CC) $(CFLAGS) -c -o $(objfiles) $^ ++else + $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ ++endif + + + clean:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301111648.r0BGmAan065693>