diff options
author | erwin <erwin@FreeBSD.org> | 2004-10-14 16:47:14 +0800 |
---|---|---|
committer | erwin <erwin@FreeBSD.org> | 2004-10-14 16:47:14 +0800 |
commit | d0de14ffa4bb0ccc10e1a43b497b44ffdebbbcd4 (patch) | |
tree | a92f6094befd3dd31723268c69a649d8d48ec89c | |
parent | 73ea679dbb2bcf602aa44e199d779df89c2cc09c (diff) | |
download | freebsd-ports-gnome-d0de14ffa4bb0ccc10e1a43b497b44ffdebbbcd4.tar.gz freebsd-ports-gnome-d0de14ffa4bb0ccc10e1a43b497b44ffdebbbcd4.tar.zst freebsd-ports-gnome-d0de14ffa4bb0ccc10e1a43b497b44ffdebbbcd4.zip |
Restore a piece of the previous commit that does some magic around
PKGNAMEPREFIX. I'm not sure about the implications for the build of
OOo, but at least it fixes INDEX builds.
-rw-r--r-- | editors/openoffice-1.1/Makefile | 6 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/Makefile | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index c8b9e47c816b..60935c0e9cb9 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -74,6 +74,12 @@ RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 # FIXME diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index c8b9e47c816b..60935c0e9cb9 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -74,6 +74,12 @@ RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 # FIXME |