diff options
| author | maho <maho@FreeBSD.org> | 2005-04-24 21:41:57 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2005-04-24 21:41:57 +0800 |
| commit | b69c99df6fb31e0bdd37d5bcf76d4f1a9ad0fd29 (patch) | |
| tree | c31ddfa1fa7470721f8f5aff9736cb54a8aff4ec | |
| parent | bdde84e051af7c9efa232382f3dc4d9494612aa4 (diff) | |
| download | freebsd-ports-graphics-b69c99df6fb31e0bdd37d5bcf76d4f1a9ad0fd29.tar.gz freebsd-ports-graphics-b69c99df6fb31e0bdd37d5bcf76d4f1a9ad0fd29.tar.zst freebsd-ports-graphics-b69c99df6fb31e0bdd37d5bcf76d4f1a9ad0fd29.zip | |
1) replace one openoffice -> openoffice.org
2) add + for LIB_DEPENDS so that solve dependency correctly
3) cleanup
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index a53e150db7d..5fac2627dcc 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -88,7 +88,7 @@ CODELINE= 645 RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXECBASE= openoffice.org-${RELEASE_NR} -DIST_SUBDIR= openoffice1.1 +DIST_SUBDIR= openoffice.org1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' PACKAGE_BASENAME= OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel @@ -119,12 +119,12 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 .if defined(WITHOUT_JAVA) -LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt .else BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .endif diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index a53e150db7d..5fac2627dcc 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -88,7 +88,7 @@ CODELINE= 645 RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXECBASE= openoffice.org-${RELEASE_NR} -DIST_SUBDIR= openoffice1.1 +DIST_SUBDIR= openoffice.org1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' PACKAGE_BASENAME= OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel @@ -119,12 +119,12 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 .if defined(WITHOUT_JAVA) -LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt .else BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .endif |