diff options
| author | tabthorpe <tabthorpe@FreeBSD.org> | 2009-06-03 00:43:44 +0800 |
|---|---|---|
| committer | tabthorpe <tabthorpe@FreeBSD.org> | 2009-06-03 00:43:44 +0800 |
| commit | ee26b79cca1a1b8920446a64841a674791619632 (patch) | |
| tree | 1f39f3e1137e745f487c0042d0d82531a4d672fc | |
| parent | 6206c3ae7382c683a2b261fd96345d7744453023 (diff) | |
| download | freebsd-ports-gnome-ee26b79cca1a1b8920446a64841a674791619632.tar.gz freebsd-ports-gnome-ee26b79cca1a1b8920446a64841a674791619632.tar.zst freebsd-ports-gnome-ee26b79cca1a1b8920446a64841a674791619632.zip | |
- Attach misc/sword15 to the build
- Add CONFLICTS with sword-1.6
- Fix LIB_DEPENDS
| -rw-r--r-- | misc/Makefile | 1 | ||||
| -rw-r--r-- | misc/sword15/Makefile | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/misc/Makefile b/misc/Makefile index a881572ac34e..9e8612984ee8 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -533,6 +533,7 @@ SUBDIR += susv2 SUBDIR += susv3 SUBDIR += sword + SUBDIR += sword15 SUBDIR += table.el SUBDIR += talkfilters SUBDIR += tcb diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile index 600511721909..008d4280ad77 100644 --- a/misc/sword15/Makefile +++ b/misc/sword15/Makefile @@ -17,6 +17,9 @@ MASTER_SITE_SUBDIR= tabthorpe MAINTAINER= tabthorpe@FreeBSD.org COMMENT= A project framework for manipulating Bible texts +CONFLICTS= sword-1.6* +NO_LATEST_LINK= yes + MAKE_JOBS_SAFE= yes USE_GNOME= pkgconfig @@ -31,7 +34,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(WITHOUT_CURL) CONFIGURE_ARGS+= --without-curl .else -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-curl pre-everything:: |