diff options
| author | John Marino <marino@FreeBSD.org> | 2014-09-30 23:31:37 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-09-30 23:31:37 +0000 |
| commit | 472f833ad405d06781a24b95c6648c72b8c7d167 (patch) | |
| tree | b99b302d5df3c21f04437c229a27a992bbf87ce1 | |
| parent | Remove obsolete PEAR_AUTOINSTALL (diff) | |
www/mohawk: Unbreak on DragonFly, remove useless LDFLAG
The provided LDFLAG of -L${LOCALBASE}/lib/event2 would have stopped
working after libevent2.so moved to ${LOCALBASE}/lib had the LDFLAG
affected anything. The LDFLAG is set by Makefile.inc, and the
handling of DragonFly is wrong for ports, although it might still be
correct for pkgsrc. Fix that with a patch and remove the LDFLAG
that doesn't do anything. No revbump required.
| -rw-r--r-- | www/mohawk/Makefile | 1 | ||||
| -rw-r--r-- | www/mohawk/files/patch-Makefile.inc | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile index cc551de9e1c0..6b83c5d07f93 100644 --- a/www/mohawk/Makefile +++ b/www/mohawk/Makefile @@ -25,7 +25,6 @@ PORTEXAMPLES= * USE_RC_SUBR= mohawk CFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/event2 OPTIONS_DEFINE= EXAMPLES diff --git a/www/mohawk/files/patch-Makefile.inc b/www/mohawk/files/patch-Makefile.inc new file mode 100644 index 000000000000..8869e0fabd01 --- /dev/null +++ b/www/mohawk/files/patch-Makefile.inc @@ -0,0 +1,16 @@ +--- Makefile.inc.orig 2014-09-15 17:40:01 UTC ++++ Makefile.inc +@@ -16,13 +16,8 @@ OSVERSION!= sysctl -n kern.osreldate + YFLAGS+= -i + CLEANFILES+= parse.i + .endif +-.if ${OPSYS} == "DragonFly" +-LDFLAGS+= -L${PREFIX}/lib/event2 +-LDADD+= -levent-2.0 +-.else + LDFLAGS+= -L${PREFIX}/lib + LDADD+= -levent +-.endif + + .elif ${OPSYS} == "NetBSD" + PREFIX?= /usr/pkg |