diff options
author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2005-12-27 15:04:09 +0000 |
---|---|---|
committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2005-12-27 15:04:09 +0000 |
commit | b3e78110f012d79e1dfecfb31256f3439f9bfef4 (patch) | |
tree | 57fdfd7445be668c906a027ced19223ae6290240 /print | |
parent | - Replace dependency devel/p5-Data-TreeDumper with (diff) |
The substitution command s|2\.3|${PYTHON_VERSION:S/^python//}|g in
print/scribus/Makefile is too liberal, substituting part of the Scribus
version (1.2.3) for the Python version (2.4), among other things.
Also bump PORTREVISION.
PR: 90974
Submitted by: Aron Stansvik <elvstone@gmail.com>
Notes
Notes:
svn path=/head/; revision=152206
Diffstat (limited to 'print')
-rw-r--r-- | print/scribus-devel/Makefile | 10 | ||||
-rw-r--r-- | print/scribus/Makefile | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 0fa3b9779611..8d79fc6f4af2 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= scribus PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scribus.org.uk/downloads/${PORTVERSION}/ @@ -51,10 +52,11 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \ - s|-O2 ||g ; \ - s|="-lc"|=""|g ; \ - s|2\.3|${PYTHON_VERSION:S/^python//}|g ; \ - s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure + s|-O2 ||g ; \ + s|="-lc"|=""|g ; \ + s|python2\.3|python${PYTHON_VERSION:S/^python//}|g ; \ + s|Python 2\.3|Python ${PYTHON_VERSION:S/^python//}|g ; \ + s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/\/share\/pixmaps\//s|^|#|g' \ ${WRKSRC}/scribus/icons/Makefile.in diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 0fa3b9779611..8d79fc6f4af2 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -8,6 +8,7 @@ PORTNAME= scribus PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scribus.org.uk/downloads/${PORTVERSION}/ @@ -51,10 +52,11 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \ - s|-O2 ||g ; \ - s|="-lc"|=""|g ; \ - s|2\.3|${PYTHON_VERSION:S/^python//}|g ; \ - s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure + s|-O2 ||g ; \ + s|="-lc"|=""|g ; \ + s|python2\.3|python${PYTHON_VERSION:S/^python//}|g ; \ + s|Python 2\.3|Python ${PYTHON_VERSION:S/^python//}|g ; \ + s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/\/share\/pixmaps\//s|^|#|g' \ ${WRKSRC}/scribus/icons/Makefile.in |