summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2008-02-01 12:00:42 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2008-02-01 12:00:42 +0000
commit76a127f4397761b7c9a95b11ac18bd6d8c151a2a (patch)
treed68031bdb5e2567a2e3b4372c225065fad9cb27d /lang
parentMark as broken on sparc64: fails to link. (diff)
- Fix build with GDL2 installed
- build with GDL2 Bundle by default - new option STEPTALK_WITHOUT_GDL2
Notes
Notes: svn path=/head/; revision=206572
Diffstat (limited to 'lang')
-rw-r--r--lang/steptalk/Makefile20
-rw-r--r--lang/steptalk/pkg-plist6
2 files changed, 25 insertions, 1 deletions
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 53f15a6b52d6..01f17d35ec86 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= steptalk
PORTVERSION= 0.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= libs
@@ -25,5 +25,23 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
WRKSRC= ${WRKDIR}/StepTalk
MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
+GDL2_PORT?= databases/gdl2
+
+.if !defined(STEPTALK_WITHOUT_GDL2)
+USE_GNUSTEP_LOCAL_LIBS+= EOInterface:${GDL2_PORT}
+PLIST_SUB+= WITH_GDL2=""
+
+post-configure:
+ ${REINPLACE_CMD} -e 's|-lgnustep-db2|-lEOAccess|' \
+ -e 's|-lgnustep-db2control|-lEOControl|' \
+ -e 's|-lgnustep-db2modeler|-lEOModeler|' \
+ ${WRKSRC}/Modules/GDL2/GNUmakefile
+.else
+PLIST_SUB+= WITH_GDL2="@comment "
+
+post-configure:
+ ${REINPLACE_CMD} -e 's|bundle.make|rules.make|' \
+ ${WRKSRC}/Modules/GDL2/GNUmakefile
+.endif
.include <bsd.port.mk>
diff --git a/lang/steptalk/pkg-plist b/lang/steptalk/pkg-plist
index 5dbb9148458a..ecc170010ba2 100644
--- a/lang/steptalk/pkg-plist
+++ b/lang/steptalk/pkg-plist
@@ -72,6 +72,10 @@ Local/Library/StepTalk/Modules/Foundation.bundle/Foundation
Local/Library/StepTalk/Modules/Foundation.bundle/Resources/Info-gnustep.plist
Local/Library/StepTalk/Modules/Foundation.bundle/Resources/ScriptingInfo.plist
Local/Library/StepTalk/Modules/Foundation.bundle/stamp.make
+%%WITH_GDL2%%Local/Library/StepTalk/Modules/GDL2.bundle/GDL2
+%%WITH_GDL2%%Local/Library/StepTalk/Modules/GDL2.bundle/Resources/Info-gnustep.plist
+%%WITH_GDL2%%Local/Library/StepTalk/Modules/GDL2.bundle/Resources/ScriptingInfo.plist
+%%WITH_GDL2%%Local/Library/StepTalk/Modules/GDL2.bundle/stamp.make
Local/Library/StepTalk/Modules/ObjectiveC.bundle/ObjectiveC
Local/Library/StepTalk/Modules/ObjectiveC.bundle/Resources/Info-gnustep.plist
Local/Library/StepTalk/Modules/ObjectiveC.bundle/Resources/ScriptingInfo.plist
@@ -86,6 +90,8 @@ Local/Tools/stexec
@dirrm Local/Library/StepTalk/Modules/SimpleTranscript.bundle
@dirrm Local/Library/StepTalk/Modules/ObjectiveC.bundle/Resources
@dirrm Local/Library/StepTalk/Modules/ObjectiveC.bundle
+%%WITH_GDL2%%@dirrm Local/Library/StepTalk/Modules/GDL2.bundle/Resources
+%%WITH_GDL2%%@dirrm Local/Library/StepTalk/Modules/GDL2.bundle
@dirrm Local/Library/StepTalk/Modules/Foundation.bundle/Resources
@dirrm Local/Library/StepTalk/Modules/Foundation.bundle
@dirrm Local/Library/StepTalk/Modules/AppKit.bundle/Resources