svn commit: r345797 - in head/ports-mgmt/chucky: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Mon Feb 24 10:31:59 UTC 2014
Author: ehaupt
Date: Mon Feb 24 10:31:58 2014
New Revision: 345797
URL: http://svnweb.freebsd.org/changeset/ports/345797
QAT: https://qat.redports.org/buildarchive/r345797/
Log:
Fix even more issues with the upstream Makefile:
- Respect CFLAGS
- Respect CC
- Don't hardcode /usr/local
Notified by: olli hauer <ohauer at gmx.de>
Modified:
head/ports-mgmt/chucky/Makefile
head/ports-mgmt/chucky/files/patch-Makefile
Modified: head/ports-mgmt/chucky/Makefile
==============================================================================
--- head/ports-mgmt/chucky/Makefile Mon Feb 24 10:31:40 2014 (r345796)
+++ head/ports-mgmt/chucky/Makefile Mon Feb 24 10:31:58 2014 (r345797)
@@ -15,7 +15,7 @@ LICENSE_NAME= CHUCKY BSD LICENSE
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
-LIB_DEPENDS= pkg:${PORTSDIR}/ports-mgmt/pkg \
+LIB_DEPENDS= libpkg.so:${PORTSDIR}/ports-mgmt/pkg \
libsqlite3.so:${PORTSDIR}/databases/sqlite3
USE_GITHUB= yes
@@ -24,8 +24,6 @@ GH_PROJECT= chucky
GH_TAGNAME= 075defe
GH_COMMIT= ${GH_TAGNAME}
-WRKSRC= ${WRKDIR}/waitman-chucky-075defe
-
SUB_FILES= pkg-message
SUB_LIST= MAN7PREFIX="${MAN7PREFIX}"
PORTDOCS= *
Modified: head/ports-mgmt/chucky/files/patch-Makefile
==============================================================================
--- head/ports-mgmt/chucky/files/patch-Makefile Mon Feb 24 10:31:40 2014 (r345796)
+++ head/ports-mgmt/chucky/files/patch-Makefile Mon Feb 24 10:31:58 2014 (r345797)
@@ -1,5 +1,19 @@
--- ./Makefile.orig 2013-03-22 05:11:27.000000000 +0100
-+++ ./Makefile 2014-02-24 09:55:51.627688711 +0100
++++ ./Makefile 2014-02-24 11:23:24.503330584 +0100
+@@ -1,8 +1,8 @@
+-prefix=/usr/local
+-man7dir=/usr/local/man/man7
+-CC=clang
+-CFLAGS=-I/usr/local/include
+-LDFLAGS=-L/usr/local/lib -lsqlite3
++prefix=${PREFIX}
++man7dir=${MANPREFIX}/man/man7
++CC?=clang
++CFLAGS+=-I${LOCALBASE}/include
++LDFLAGS+=-L${LOCALBASE}/lib -lsqlite3
+
+ all: chucky
+
@@ -12,8 +12,9 @@
rm chucky
More information about the svn-ports-head
mailing list