diff options
| -rw-r--r-- | Mk/bsd.gnustep.mk | 22 | ||||
| -rw-r--r-- | devel/gnustep/Makefile | 8 | ||||
| -rw-r--r-- | devel/gnustep/bsd.gnustep.mk | 22 |
3 files changed, 46 insertions, 6 deletions
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk index 6f6609f14027..7ed469358c3e 100644 --- a/Mk/bsd.gnustep.mk +++ b/Mk/bsd.gnustep.mk @@ -64,11 +64,27 @@ PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} SYSTEMDIR= ${PREFIX}/System SYSMAKEDIR= ${SYSTEMDIR}/Makefiles -SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} -COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu -BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu +.if defined(WITH_GNUSTEP_DEVEL) +SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L} +COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries/${COMBOPATH} +LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries/${COMBOPATH} +PLIST_SUB+= SYSTEMLIBRARY="System/Library" +PLIST_SUB+= LOCALLIBRARY="Local/Library" +PLIST_SUB+= GNUSTEP_DEVEL="" +PLIST_SUB+= GNUSTEP_STABLE="@comment " +PKGNAMESUFFIX?= -devel +.else +SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} +COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${COMBOPATH} LOCALLIBDIR= ${PREFIX}/Local/Libraries/${COMBOPATH} +PLIST_SUB+= SYSTEMLIBRARY="System" +PLIST_SUB+= LOCALLIBRARY="Local" +PLIST_SUB+= GNUSTEP_DEVEL="@comment " +PLIST_SUB+= GNUSTEP_STABLE="" +.else +.endif +BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles CC= gcc32 CXX= g++32 diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile index ad76f4b36f9e..379d6f4f58ae 100644 --- a/devel/gnustep/Makefile +++ b/devel/gnustep/Makefile @@ -6,7 +6,11 @@ # PORTNAME= gnustep +.if defined(WITH_GNUSTEP_DEVEL) +PORTVERSION= 1.7.0 +.else PORTVERSION= 1.6.0 +.endif CATEGORIES= devel lang MASTER_SITES= # empty DISTFILES= # empty @@ -36,7 +40,11 @@ GNU_ARCH= ix86 GNU_ARCH= ${MACHINE_ARCH} .endif +.if defined(WITH_GNUSTEP_DEVEL) +SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L} +.else SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} +.endif COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH} diff --git a/devel/gnustep/bsd.gnustep.mk b/devel/gnustep/bsd.gnustep.mk index 6f6609f14027..7ed469358c3e 100644 --- a/devel/gnustep/bsd.gnustep.mk +++ b/devel/gnustep/bsd.gnustep.mk @@ -64,11 +64,27 @@ PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} SYSTEMDIR= ${PREFIX}/System SYSMAKEDIR= ${SYSTEMDIR}/Makefiles -SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} -COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu -BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu +.if defined(WITH_GNUSTEP_DEVEL) +SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L} +COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries/${COMBOPATH} +LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries/${COMBOPATH} +PLIST_SUB+= SYSTEMLIBRARY="System/Library" +PLIST_SUB+= LOCALLIBRARY="Local/Library" +PLIST_SUB+= GNUSTEP_DEVEL="" +PLIST_SUB+= GNUSTEP_STABLE="@comment " +PKGNAMESUFFIX?= -devel +.else +SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} +COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${COMBOPATH} LOCALLIBDIR= ${PREFIX}/Local/Libraries/${COMBOPATH} +PLIST_SUB+= SYSTEMLIBRARY="System" +PLIST_SUB+= LOCALLIBRARY="Local" +PLIST_SUB+= GNUSTEP_DEVEL="@comment " +PLIST_SUB+= GNUSTEP_STABLE="" +.else +.endif +BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles CC= gcc32 CXX= g++32 |