diff options
| author | makc <makc@FreeBSD.org> | 2010-10-10 02:02:24 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2010-10-10 02:02:24 +0800 |
| commit | d8f6eeba382bf9faa1947014839f767c08fb0a38 (patch) | |
| tree | 4acb9cbe03c5d29ebd57960461a09cd969f31842 /print | |
| parent | b47ec9b1e18ed0100d0bd32989e308fedaca27f5 (diff) | |
| download | freebsd-ports-gnome-d8f6eeba382bf9faa1947014839f767c08fb0a38.tar.gz freebsd-ports-gnome-d8f6eeba382bf9faa1947014839f767c08fb0a38.tar.zst freebsd-ports-gnome-d8f6eeba382bf9faa1947014839f767c08fb0a38.zip | |
Mark conflict with lyx-devel
Diffstat (limited to 'print')
| -rw-r--r-- | print/lyx/Makefile | 3 | ||||
| -rw-r--r-- | print/lyx14/Makefile | 4 | ||||
| -rw-r--r-- | print/lyx16/Makefile | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 2f5d8c404d60..8b67f9ef1e0d 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -7,6 +7,7 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.7 +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -22,7 +23,7 @@ LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs LICENSE= GPLv2 -CONFLICTS= lyx-1.4* +CONFLICTS= lyx-1.4* lyx-devel-* MAJOR_VERSION= 1.6 USE_BZIP= yes diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index 054126a72756..e8f2eb54fb3f 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -7,7 +7,7 @@ PORTNAME= lyx PORTVERSION= 1.4.5.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/1.4.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/1.4.x/ \ @@ -44,7 +44,7 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ MAN1= lyx.1 tex2lyx.1 lyxclient.1 LATEST_LINK= lyx14 -CONFLICTS= lyx-1.6* +CONFLICTS= lyx-1.6* lyx-devel-* post-patch: # Removing mention of the bundled boost diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index 2f5d8c404d60..8b67f9ef1e0d 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -7,6 +7,7 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.7 +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -22,7 +23,7 @@ LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs LICENSE= GPLv2 -CONFLICTS= lyx-1.4* +CONFLICTS= lyx-1.4* lyx-devel-* MAJOR_VERSION= 1.6 USE_BZIP= yes |