diff options
| -rw-r--r-- | Mk/bsd.gnustep.mk | 5 | ||||
| -rw-r--r-- | devel/gnustep/Makefile | 1 | ||||
| -rw-r--r-- | devel/ruby-gnustep/Makefile | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk index 16dfe35..c78bb1d 100644 --- a/Mk/bsd.gnustep.mk +++ b/Mk/bsd.gnustep.mk @@ -74,9 +74,6 @@ BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries -PLIST_SUB+= SYSTEMLIBRARY="System/Library" -PLIST_SUB+= LOCALLIBRARY="Local/Library" -PLIST_SUB+= NOFLAT="" .if defined(WITH_GNUSTEP_DEVEL) PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} PLIST_SUB+= GNUSTEP_DEVEL="" @@ -88,7 +85,7 @@ PLIST_SUB+= GNUSTEP_STABLE="" DEFAULT_LIBVERSION?= 0.0.1 .endif -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} +PLIST_SUB+= GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION} PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} PLIST_SUB+= LIBVERSION=${DEFAULT_LIBVERSION} PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1} diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile index 91f6aac..7eb7d40 100644 --- a/devel/gnustep/Makefile +++ b/devel/gnustep/Makefile @@ -43,7 +43,6 @@ GNU_ARCH= ix86 GNU_ARCH= ${MACHINE_ARCH} .endif -COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries COMBOLIBDIR= ${SYSLIBDIR} BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile index 829d737..6179bed 100644 --- a/devel/ruby-gnustep/Makefile +++ b/devel/ruby-gnustep/Makefile @@ -74,7 +74,6 @@ MAKE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT} \ GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} \ PATH=${PATH}:${GNUSTEP_SYSTEM_ROOT}/Tools -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} NO_FILTER_SHLIBS= yes post-extract: |
