aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/gnustep-guile/Makefile53
-rw-r--r--lang/gnustep-guile/pkg-plist25
2 files changed, 40 insertions, 38 deletions
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 328405916a80..1f83897758f6 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -16,58 +16,35 @@ MASTER_SITE_SUBDIR= libs
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep interface to the GUILE scheme interpreter
-BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
-RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
-LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 300000
-BROKEN= "Sorry, this port does not work on FreeBSD-2.2.x"
-.endif
+LIB_DEPENDS+= guile.10:${PORTSDIR}/lang/guile
PREFIX= ${LOCALBASE}/GNUstep
+NO_MTREE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=
USE_GMAKE= yes
MAKEFILE=
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
-NO_MTREE= yes
-USE_GCC= 3.2
+PLIST_SUB+= GUILE_VER="${GUILE_VER}"
MAN1= greg.1
-.if ${MACHINE_ARCH} == "i386"
-GNU_ARCH= ix86
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX?= -nox11
+USE_GNUSTEP_BASE= yes
+PLIST_SUB+= USEX11="@comment "
.else
-GNU_ARCH= ${MACHINE_ARCH}
+USE_GNUSTEP_BACK= yes
+PLIST_SUB+= USEX11=""
.endif
-PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
-COMBOLIBDIR= ${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
-
-do-configure:
- @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
- if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
- INSTALL_DATA="${INSTALL} -c" \
- INSTALL_PROGRAM="${INSTALL} -c" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
- ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
- ${CAT} ${CONFIGURE_LOG}; \
- ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
- ${FALSE}; \
- fi)
+.include <bsd.port.pre.mk>
-do-build:
- @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+USE_GNUSTEP_CONFIGURE= yes
+USE_GNUSTEP_BUILD= yes
+USE_GNUSTEP_INSTALL= yes
+.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk"
-do-install:
- @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+GUILE_VER!= (cd ${PORTSDIR}/lang/guile && make -V PORTVERSION)
.include <bsd.port.post.mk>
diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index c65dd82bb88b..e6230f4dec85 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -1,3 +1,15 @@
+%%USEX11%%System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/guile-gui
+%%USEX11%%System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
+%%USEX11%%System/Applications/guile-gui.app/Resources/Info-gnustep.plist
+%%USEX11%%System/Applications/guile-gui.app/Resources/guile-gui.desktop
+%%USEX11%%System/Applications/guile-gui.app/guile-gui
+%%USEX11%%System/Applications/guile-gui.app/stamp.make
+%%USEX11%%System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/gui
+%%USEX11%%System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
+%%USEX11%%System/Applications/gui.app/Resources/Info-gnustep.plist
+%%USEX11%%System/Applications/gui.app/Resources/gui.desktop
+%%USEX11%%System/Applications/gui.app/gui
+%%USEX11%%System/Applications/gui.app/stamp.make
System/Headers/ScriptKit/Guile.h
System/Headers/ScriptKit/GuileInterpreter.h
System/Headers/ScriptKit/GuileInvocation.h
@@ -16,6 +28,7 @@ System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so.1.0.0
System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so
System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so.%%VERSION%%
System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so.1
+%%USEX11%%System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_gui.so.%%VERSION%%
System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so
System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so.%%VERSION%%
System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so.1
@@ -29,6 +42,16 @@ lib/libgreg.a
lib/libgreg.la
lib/libgreg.so
lib/libgreg.so.1
+%%USEX11%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%USEX11%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%
+%%USEX11%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%
+%%USEX11%%@dirrm System/Applications/guile-gui.app/Resources
+%%USEX11%%@dirrm System/Applications/guile-gui.app
+%%USEX11%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%USEX11%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%
+%%USEX11%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%
+%%USEX11%%@dirrm System/Applications/gui.app/Resources
+%%USEX11%%@dirrm System/Applications/gui.app
@dirrm System/Libraries/Guile/languages/gstep-guile
@dirrm System/Libraries/Guile/languages
@dirrm System/Libraries/Guile
@@ -39,3 +62,5 @@ lib/libgreg.so.1
@dirrm info
@dirrm man/man1
@dirrm man
+@cwd %%LOCALBASE%%
+share/guile/%%GUILE_VER%%/ice-9/greg.scm