aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/gnustep-make/Makefile2
-rw-r--r--devel/gnustep-make/distinfo4
-rw-r--r--devel/gnustep/Makefile2
-rw-r--r--lang/gnustep-base/Makefile27
-rw-r--r--lang/gnustep-base/distinfo4
-rw-r--r--lang/gnustep-base/pkg-plist13
6 files changed, 40 insertions, 12 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 4d14ffdb4f42..8697930da6dc 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-make
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.9.0
+PORTVERSION= 1.9.1
.else
PORTVERSION= 1.8.0
PORTREVISION= 1
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index bf907133a36e..2e047998b28a 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnustep-make-1.9.0.tar.gz) = 494cc5bd3e09eafb70de31fcf6d2b04e
-SIZE (gnustep-make-1.9.0.tar.gz) = 365487
+MD5 (gnustep-make-1.9.1.tar.gz) = 0d1e5e0d8e57662b6c2cf969d9a09750
+SIZE (gnustep-make-1.9.1.tar.gz) = 370625
MD5 (gnustep-make-1.8.0.tar.gz) = 3d8de1ed93c45b2cbfa32fe9fd0396dd
SIZE (gnustep-make-1.8.0.tar.gz) = 359394
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 7457381bc72a..d4bd574b3d63 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.9.0
+PORTVERSION= 1.9.1
.else
PORTVERSION= 1.8.0
.endif
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 2aff611b8f52..041d1bc5b36f 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-base
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.9.0
+PORTVERSION= 1.9.1
.else
PORTVERSION= 1.8.0
PORTREVISION= 1
@@ -42,14 +42,30 @@ PLIST_SUB+= LOCALBASE=${LOCALBASE}
.if defined(WITHOUT_OPENSSL)
CONFIGURE_ARGS+= --disable-openssl
+PLIST_SUB+= OPENSSL="@comment "
.else
USE_OPENSSL= yes
+.if defined(WITH_GNUSTEP_DEVEL)
+PLIST_SUB+= OPENSSL="@comment "
+.else
+PLIST_SUB+= OPENSSL=""
+.endif
+MAKE_APPS= SSL
+INSTALL_APPS= SSL
.endif
.include <bsd.port.pre.mk>
TARGLIB!= (cd ${PORTSDIR}/${GNUSTEP_OBJC_PORT} && make -V TARGLIB)
+.if defined(WITH_GNUSTEP_DEVEL)
+post-build:
+.for i in ${MAKE_APPS}
+ (cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+.endfor
+.endif
+
post-extract:
@${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" \
-e "s=%%TARGLIB%%=${TARGLIB}=" ${FILESDIR}/GNUstep.sh \
@@ -59,8 +75,17 @@ post-install:
-@${MKDIR} ${ETCDIR}/rc.d
${INSTALL_SCRIPT} ${WRKSRC}/GNUstep.sh ${ETCDIR}/rc.d/GNUstep.sh
${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
+.if defined(WITH_GNUSTEP_DEVEL)
+.for i in ${INSTALL_APPS}
+ (cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -d ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+.endfor
+.endif
test:
@(cd ${WRKSRC}/Testing && . ${SYSTEMDIR}/Makefiles/GNUstep.sh; ${GMAKE})
.include <bsd.port.post.mk>
+
+# bsd.port.post.mk clobbers MAKE_ENV
+MAKE_ENV+= PATH=${autotools_path}:$(PREFIX)/System/Tools:${PATH}
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 185bfb18071a..3318bd4cfebe 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnustep-base-1.9.0.tar.gz) = 83a62ec009a0bfdefd170ef44b3a4fe0
-SIZE (gnustep-base-1.9.0.tar.gz) = 1646255
+MD5 (gnustep-base-1.9.1.tar.gz) = ae5a29e32a392c78ea2e93a639487817
+SIZE (gnustep-base-1.9.1.tar.gz) = 1689980
MD5 (gnustep-base-1.8.0.tar.gz) = 3ce14c1f8384d3e3837f28e6a5155bc9
SIZE (gnustep-base-1.8.0.tar.gz) = 1629498
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index a8aaeb84c9f7..bf8181c495b3 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -1,6 +1,6 @@
-System/Library/Bundles/SSL.bundle/Resources/Info-gnustep.plist
-System/Library/Bundles/SSL.bundle/SSL
-System/Library/Bundles/SSL.bundle/stamp.make
+%%OPENSSL%%System/Library/Bundles/SSL.bundle/Resources/Info-gnustep.plist
+%%OPENSSL%%System/Library/Bundles/SSL.bundle/SSL
+%%OPENSSL%%System/Library/Bundles/SSL.bundle/stamp.make
System/Library/DTDs/gsdoc-0_6_5.dtd
System/Library/DTDs/gsdoc-0_6_6.dtd
System/Library/DTDs/gsdoc-0_6_7.dtd
@@ -44,8 +44,10 @@ System/Library/Headers/Foundation/NSFormatter.h
System/Library/Headers/Foundation/NSGeometry.h
System/Library/Headers/Foundation/NSHashTable.h
System/Library/Headers/Foundation/NSHost.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/Foundation/NSIndexSet.h
System/Library/Headers/Foundation/NSInvocation.h
System/Library/Headers/Foundation/NSKeyValueCoding.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/Foundation/NSKeyedArchiver.h
System/Library/Headers/Foundation/NSLock.h
System/Library/Headers/Foundation/NSMapTable.h
System/Library/Headers/Foundation/NSMethodSignature.h
@@ -61,6 +63,7 @@ System/Library/Headers/Foundation/NSPortCoder.h
System/Library/Headers/Foundation/NSPortMessage.h
System/Library/Headers/Foundation/NSPortNameServer.h
System/Library/Headers/Foundation/NSProcessInfo.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/Foundation/NSPropertyList.h
System/Library/Headers/Foundation/NSProtocolChecker.h
System/Library/Headers/Foundation/NSProxy.h
System/Library/Headers/Foundation/NSRange.h
@@ -782,8 +785,8 @@ System/Tools/xmlparse
@dirrm System/Library/Documentation/man/man8
@dirrm System/Library/Documentation/man/man1
@dirrm System/Library/DTDs
-@dirrm System/Library/Bundles/SSL.bundle/Resources
-@dirrm System/Library/Bundles/SSL.bundle
+%%OPENSSL%%@dirrm System/Library/Bundles/SSL.bundle/Resources
+%%OPENSSL%%@dirrm System/Library/Bundles/SSL.bundle
@exec mkdir -p %D/System/Library/Documentation/man/man1
@cwd %%LOCALBASE%%
etc/gdomap_if