From 68126520ae8ae84df4ccc0989d6fbbaa2da0dae2 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 29 May 2007 03:00:34 +0000
Subject: [PATCH] Import gnustep-make-2.0.1

The makefile package is a simple, powerful and extensible way to write
makefiles for a GNUstep-based project.  It allows the user to write a
project without having to deal with the complex issues associated with
configuration, building, installation, and packaging.  It also allows
the user to easily create cross-compiled binaries.
---
 x11/gnustep/make/Makefile                     |  43 ++++++
 x11/gnustep/make/distinfo                     |   5 +
 x11/gnustep/make/files/openbsd                |  61 ++++++++
 x11/gnustep/make/patches/patch-GNUmakefile_in |  30 ++++
 .../patches/patch-Instance_application_make   |  24 ++++
 .../make/patches/patch-Instance_bundle_make   |  32 +++++
 .../patches/patch-Instance_framework_make     |  41 ++++++
 .../make/patches/patch-Instance_library_make  |  12 ++
 x11/gnustep/make/patches/patch-target_make    |  34 +++++
 x11/gnustep/make/pkg/DESCR                    |   6 +
 x11/gnustep/make/pkg/PLIST                    | 133 ++++++++++++++++++
 11 files changed, 421 insertions(+)
 create mode 100644 x11/gnustep/make/Makefile
 create mode 100644 x11/gnustep/make/distinfo
 create mode 100644 x11/gnustep/make/files/openbsd
 create mode 100644 x11/gnustep/make/patches/patch-GNUmakefile_in
 create mode 100644 x11/gnustep/make/patches/patch-Instance_application_make
 create mode 100644 x11/gnustep/make/patches/patch-Instance_bundle_make
 create mode 100644 x11/gnustep/make/patches/patch-Instance_framework_make
 create mode 100644 x11/gnustep/make/patches/patch-Instance_library_make
 create mode 100644 x11/gnustep/make/patches/patch-target_make
 create mode 100644 x11/gnustep/make/pkg/DESCR
 create mode 100644 x11/gnustep/make/pkg/PLIST

diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile
new file mode 100644
index 00000000000..8e5ab12d4ff
--- /dev/null
+++ b/x11/gnustep/make/Makefile
@@ -0,0 +1,43 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+
+PKG_ARCH=	*
+
+COMMENT=	"GNUstep makefile package"
+
+DISTNAME=	gnustep-make-2.0.1
+CATEGORIES=	devel
+
+HOMEPAGE=	http://www.gnustep.org/
+
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
+
+RUN_DEPENDS=	::archivers/gtar
+
+USE_GMAKE=	Yes
+
+CONFIGURE_STYLE=simple
+CONFIGURE_ENV=	ac_cv_prog_LATEX2HTML="" \
+		INSTALL="install -c" \
+		INSTALL_PROGRAM="install -c -s -m 555" \
+		INSTALL_DATA="install -c -m 444"
+CONFIGURE_ARGS=	--with-layout=openbsd \
+		--prefix=${PREFIX} \
+		--with-config-file=${SYSCONFDIR}/GNUstep.conf \
+		--with-tar=${LOCALBASE}/bin/gtar \
+		--enable-multi-platform \
+		--with-library-combo="gnu-gnu-gnu" \
+		--with-thread-lib="-pthread"
+
+pre-configure:
+	@perl -p -e 's,!!PREFIX!!,${PREFIX},g' files/openbsd \
+		> ${WRKSRC}/FilesystemLayouts/openbsd
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/GNUstep.conf \
+		${PREFIX}/share/GNUstep/GNUstep.conf
+	${INSTALL_MAN} ${WRKSRC}/Documentation/openapp.1 \
+		${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Documentation/GNUstep.7 \
+		${PREFIX}/man/man7
+
+.include <bsd.port.mk>
diff --git a/x11/gnustep/make/distinfo b/x11/gnustep/make/distinfo
new file mode 100644
index 00000000000..8632ca600a5
--- /dev/null
+++ b/x11/gnustep/make/distinfo
@@ -0,0 +1,5 @@
+MD5 (gnustep/gnustep-make-2.0.1.tar.gz) = 8mhzPqI/U+IR45d+J7RgmA==
+RMD160 (gnustep/gnustep-make-2.0.1.tar.gz) = tw8s+8oCiYAYQDeHzVq4eaC+r9g=
+SHA1 (gnustep/gnustep-make-2.0.1.tar.gz) = W5cio2TmuDlUL9fMxqz37U5cv28=
+SHA256 (gnustep/gnustep-make-2.0.1.tar.gz) = Y9XxvI8vEnB/DBCd3/NJKil+SuIf8T7uYu1OKqdh9lM=
+SIZE (gnustep/gnustep-make-2.0.1.tar.gz) = 444343
diff --git a/x11/gnustep/make/files/openbsd b/x11/gnustep/make/files/openbsd
new file mode 100644
index 00000000000..f79531538cf
--- /dev/null
+++ b/x11/gnustep/make/files/openbsd
@@ -0,0 +1,61 @@
+# $OpenBSD: openbsd,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+#
+# OpenBSD filesystem layout
+
+GNUSTEP_DEFAULT_PREFIX=!!PREFIX!!
+
+GNUSTEP_SYSTEM_USERS_DIR=/home
+GNUSTEP_NETWORK_USERS_DIR=/home
+GNUSTEP_LOCAL_USERS_DIR=/home
+
+GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
+
+GNUSTEP_SYSTEM_APPS=/libexec/GNUstep
+GNUSTEP_SYSTEM_ADMIN_APPS=/libexec/GNUstep
+GNUSTEP_SYSTEM_WEB_APPS=/libexec/GNUstep
+GNUSTEP_SYSTEM_TOOLS=/bin
+GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
+GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
+GNUSTEP_SYSTEM_HEADERS=/include
+GNUSTEP_SYSTEM_LIBRARIES=/lib
+GNUSTEP_SYSTEM_DOC=/share/doc/GNUstep
+GNUSTEP_SYSTEM_DOC_MAN=/man
+GNUSTEP_SYSTEM_DOC_INFO=/info
+
+GNUSTEP_NETWORK_APPS=/libexec/GNUstep
+GNUSTEP_NETWORK_ADMIN_APPS=/libexec/GNUstep
+GNUSTEP_NETWORK_WEB_APPS=/libexec/GNUstep
+GNUSTEP_NETWORK_TOOLS=/bin
+GNUSTEP_NETWORK_ADMIN_TOOLS=/sbin
+GNUSTEP_NETWORK_LIBRARY=/lib/GNUstep
+GNUSTEP_NETWORK_HEADERS=/include
+GNUSTEP_NETWORK_LIBRARIES=/lib
+GNUSTEP_NETWORK_DOC=/share/doc/GNUstep
+GNUSTEP_NETWORK_DOC_MAN=/man
+GNUSTEP_NETWORK_DOC_INFO=/info
+
+GNUSTEP_LOCAL_APPS=/libexec/GNUstep
+GNUSTEP_LOCAL_ADMIN_APPS=/libexec/GNUstep
+GNUSTEP_LOCAL_WEB_APPS=/libexec/GNUstep
+GNUSTEP_LOCAL_TOOLS=/bin
+GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin
+GNUSTEP_LOCAL_LIBRARY=/lib/GNUstep
+GNUSTEP_LOCAL_HEADERS=/include
+GNUSTEP_LOCAL_LIBRARIES=/lib
+GNUSTEP_LOCAL_DOC=/share/doc/GNUstep
+GNUSTEP_LOCAL_DOC_MAN=/man
+GNUSTEP_LOCAL_DOC_INFO=/info
+
+GNUSTEP_USER_DIR_APPS=GNUstep/Applications
+GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
+GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
+GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
+GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
+GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
+GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
+GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
+GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
+GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
+GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
diff --git a/x11/gnustep/make/patches/patch-GNUmakefile_in b/x11/gnustep/make/patches/patch-GNUmakefile_in
new file mode 100644
index 00000000000..38cf06e194a
--- /dev/null
+++ b/x11/gnustep/make/patches/patch-GNUmakefile_in
@@ -0,0 +1,30 @@
+$OpenBSD: patch-GNUmakefile_in,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+--- GNUmakefile.in.orig	Thu Mar  8 18:15:05 2007
++++ GNUmakefile.in	Sat May 12 12:30:48 2007
+@@ -69,7 +69,7 @@ export GNUSTEP_TARGET_LDIR
+ export MAYBE_LIBRARY_COMBO
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
++INSTALL_PROGRAM	= @INSTALL_SCRIPT@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ VERTAG = $(subst .,_,$(GNUSTEP_MAKE_VERSION))
+@@ -124,7 +124,6 @@ install: generated-files
+ 	 echo "Creating makefile directories in: $(makedir)"; \
+ 	 $(srcdir)/mkinstalldirs \
+ 		$(makedir) \
+-		$(makedir)/$(GNUSTEP_TARGET_CPU) \
+ 		$(makedir)/$(GNUSTEP_TARGET_DIR) \
+ 		$(makedir)/$(GNUSTEP_TARGET_LDIR) \
+ 		$(makedir)/Additional \
+@@ -133,9 +132,6 @@ install: generated-files
+ 		$(makedir)/Instance \
+ 		$(makedir)/Instance/Shared \
+ 		$(makedir)/Instance/Documentation)
+-	$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
+-	 $(srcdir)/mkinstalldirs "$(GNUSTEP_CONFIG_FILE_DIR)"; \
+-	 $(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
+ 	 $(EC)(echo "Installing gnustep-make support software")
+ 	 $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
+ 		clean_cpu.sh clean_os.sh \
diff --git a/x11/gnustep/make/patches/patch-Instance_application_make b/x11/gnustep/make/patches/patch-Instance_application_make
new file mode 100644
index 00000000000..31f909188fc
--- /dev/null
+++ b/x11/gnustep/make/patches/patch-Instance_application_make
@@ -0,0 +1,24 @@
+$OpenBSD: patch-Instance_application_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+--- Instance/application.make.orig	Fri Mar 16 06:23:56 2007
++++ Instance/application.make	Mon May 28 20:17:38 2007
+@@ -277,9 +277,6 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUS
+ 	  fi; \
+ 	  echo "  NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
+ 	  echo "}") >$@$(END_ECHO)
+-	 -$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
+-	   plmerge $@ "$(GNUSTEP_INSTANCE)Info.plist"; \
+-	  fi$(END_ECHO)
+ endif
+ 
+ $(APP_DIR)/Resources/$(GNUSTEP_INSTANCE).desktop: \
+@@ -338,9 +335,7 @@ ifeq ($(HAS_LN_S), yes)
+ internal-install-app-wrapper: $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
+ 	$(ECHO_NOTHING)\
+ 	  cd $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR); \
+-	  $(RM_LN_S) $(GNUSTEP_INSTANCE); \
+-	  $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR) $(APP_INSTALL_DIR)/$(APP_FILE_NAME)` \
+-	          $(GNUSTEP_INSTANCE)$(END_ECHO)
++	  $(RM_LN_S) $(GNUSTEP_INSTANCE)$(END_ECHO)
+ else
+ # Not sure that we can use relative paths with 'exec' in a portable
+ # way.  We want the stuff to work with DESTDIR, so in this case we use
diff --git a/x11/gnustep/make/patches/patch-Instance_bundle_make b/x11/gnustep/make/patches/patch-Instance_bundle_make
new file mode 100644
index 00000000000..ea3d21cd0d6
--- /dev/null
+++ b/x11/gnustep/make/patches/patch-Instance_bundle_make
@@ -0,0 +1,32 @@
+$OpenBSD: patch-Instance_bundle_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+--- Instance/bundle.make.orig	Tue May 15 17:29:03 2007
++++ Instance/bundle.make	Tue May 15 17:29:09 2007
+@@ -83,6 +83,8 @@ ALL_BUNDLE_LIBS =						\
+ 
+ ifeq ($(BUILD_DLL),yes)
+ BUNDLE_OBJ_EXT = $(DLL_LIBEXT)
++else
++BUNDLE_OBJ_EXT = $(SHARED_LIBEXT)
+ endif
+ 
+ endif # OBJ_FILES_TO_LINK
+@@ -268,9 +270,6 @@ $(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_D
+ 	  echo "  NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
+ 	  echo "  NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
+ 	  echo "}") >$@$(END_ECHO)
+-	$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
+-	  plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
+-	fi$(END_ECHO)
+ else # following code for when no object file is built
+ # GNUstep bundles
+ $(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_DIR)/Resources \
+@@ -279,9 +278,6 @@ $(BUNDLE_DIR)/Resources/Info-gnustep.plist: $(BUNDLE_D
+ 	$(ECHO_CREATING)(echo "{"; echo '  NOTE = "Automatically generated, do not edit!";'; \
+ 	  echo "  NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
+ 	  echo "}") >$@$(END_ECHO)
+-	$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
+-	  plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
+-	fi$(END_ECHO)
+ endif
+ 
+ endif # FOUNDATION_LIB != apple
diff --git a/x11/gnustep/make/patches/patch-Instance_framework_make b/x11/gnustep/make/patches/patch-Instance_framework_make
new file mode 100644
index 00000000000..9551e948844
--- /dev/null
+++ b/x11/gnustep/make/patches/patch-Instance_framework_make
@@ -0,0 +1,41 @@
+$OpenBSD: patch-Instance_framework_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+--- Instance/framework.make.orig	Tue Apr 10 17:55:26 2007
++++ Instance/framework.make	Tue May 15 17:23:50 2007
+@@ -508,13 +508,7 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G
+ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
+ ifeq ($(MAKE_CURRENT_VERSION),yes)
+ 	$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \
+-	$(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \
+-	$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \
+-	                            Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)` \
+-	        $(GNUSTEP_INSTANCE); \
+-	$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \
+-	                            Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(FRAMEWORK_LIBRARY_FILE)` \
+-	        $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
++	$(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
+ endif
+ endif
+ endif
+@@ -529,8 +523,7 @@ $(FRAMEWORK_FILE): $(DUMMY_FRAMEWORK_OBJ_FILE) $(OBJ_F
+ 	$(ECHO_LINKING) \
+ 	$(LIB_LINK_CMD) || $(RM) $(FRAMEWORK_FILE) ; \
+ 	(cd $(LIB_LINK_OBJ_DIR); \
+-	  $(RM_LN_S) $(GNUSTEP_INSTANCE); \
+-	  $(LN_S) $(LIB_LINK_FRAMEWORK_FILE) $(GNUSTEP_INSTANCE)) \
++	  $(RM_LN_S) $(GNUSTEP_INSTANCE)) \
+ 	$(END_ECHO)
+ 
+ PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
+@@ -600,11 +593,7 @@ endif
+ 	$(RM_LN_S) $(FRAMEWORK_LIBRARY_FILE); \
+ 	$(RM_LN_S) $(SONAME_FRAMEWORK_FILE); \
+ 	$(RM_LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE); \
+-	$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE)` $(FRAMEWORK_LIBRARY_FILE); \
+-	if test -r "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \
+-	  $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)` $(SONAME_FRAMEWORK_FILE); \
+-	fi; \
+-	$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
++	mv `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
+ ifneq ($(CHOWN_TO),)
+ 	$(ECHO_CHOWNING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \
+ 	$(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \
diff --git a/x11/gnustep/make/patches/patch-Instance_library_make b/x11/gnustep/make/patches/patch-Instance_library_make
new file mode 100644
index 00000000000..17302a26ac7
--- /dev/null
+++ b/x11/gnustep/make/patches/patch-Instance_library_make
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Instance_library_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+--- Instance/library.make.orig	Fri May 11 11:29:00 2007
++++ Instance/library.make	Fri May 11 11:31:08 2007
+@@ -182,7 +182,7 @@ endif
+ ifneq ($(BUILD_DLL),yes)
+ 
+ LIBRARY_FILE = $(LIBRARY_NAME_WITH_LIB)$(SHARED_LIBEXT)
+-VERSION_LIBRARY_FILE = $(LIBRARY_FILE).$(VERSION)
++VERSION_LIBRARY_FILE = $(LIBRARY_FILE).$(INTERFACE_VERSION)
+ SONAME_LIBRARY_FILE  = $(LIBRARY_FILE).$(INTERFACE_VERSION)
+ 
+ else # BUILD_DLL
diff --git a/x11/gnustep/make/patches/patch-target_make b/x11/gnustep/make/patches/patch-target_make
new file mode 100644
index 00000000000..a54f9f7a99b
--- /dev/null
+++ b/x11/gnustep/make/patches/patch-target_make
@@ -0,0 +1,34 @@
+$OpenBSD: patch-target_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+--- target.make.orig	Fri Mar  9 12:42:00 2007
++++ target.make	Wed May 23 15:47:43 2007
+@@ -748,18 +748,17 @@ SHARED_LIB_LINK_CMD = \
+ 	  $(RM_LN_S) $(LIB_LINK_FILE); \
+           if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
+             $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
+-            $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
+-          fi; \
+-	  $(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE))
++          fi;)
+ AFTER_INSTALL_SHARED_LIB_CMD = \
+ 	(cd $(LIB_LINK_INSTALL_DIR); \
+ 	  $(RM_LN_S) $(LIB_LINK_FILE); \
+           if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
+             $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
+-            $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
+           fi; \
+-	  $(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE); \
+ 	)
++AFTER_INSTALL_SHARED_LIB_CHOWN = \
++	(cd $(LIB_LINK_INSTALL_DIR); \
++	chown $(CHOWN_TO) $(LIB_LINK_SONAME_FILE))
+ 
+ OBJ_MERGE_CMD		= \
+ 	$(CC) -nostdlib -r $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+@@ -772,6 +771,7 @@ BUNDLE_LD	= $(CC)
+ BUNDLE_LDFLAGS  += -shared -fPIC
+ ADDITIONAL_LDFLAGS += -Wl,-E
+ STATIC_LDFLAGS += -static
++OBJC_LIBS += -pthread
+ 
+ # nm on OpenBSD is rather like on Darwin
+ EXTRACT_CLASS_NAMES_COMMAND = nm  -g $$object_file | sed -n -e '/[^U] __objc_class_name_/ {s/[0-9a-f]* [^U] __objc_class_name_//p;}'
diff --git a/x11/gnustep/make/pkg/DESCR b/x11/gnustep/make/pkg/DESCR
new file mode 100644
index 00000000000..90080102b06
--- /dev/null
+++ b/x11/gnustep/make/pkg/DESCR
@@ -0,0 +1,6 @@
+GNUstep makefile package.
+The makefile package is a simple, powerful and extensible way to write
+makefiles for a GNUstep-based project.  It allows the user to write a
+project without having to deal with the complex issues associated with
+configuration, building, installation, and packaging.  It also allows
+the user to easily create cross-compiled binaries.
diff --git a/x11/gnustep/make/pkg/PLIST b/x11/gnustep/make/pkg/PLIST
new file mode 100644
index 00000000000..215b4c125fc
--- /dev/null
+++ b/x11/gnustep/make/pkg/PLIST
@@ -0,0 +1,133 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $
+bin/debugapp
+bin/gnustep-config
+bin/openapp
+bin/opentool
+@man man/man1/openapp.1
+@man man/man7/GNUstep.7
+share/GNUstep/
+share/GNUstep/GNUstep.conf
+@sample ${SYSCONFDIR}/GNUstep.conf
+share/GNUstep/Makefiles/
+share/GNUstep/Makefiles/Additional/
+share/GNUstep/Makefiles/Auxiliary/
+share/GNUstep/Makefiles/GNUstep-reset.sh
+share/GNUstep/Makefiles/GNUstep.csh
+share/GNUstep/Makefiles/GNUstep.sh
+share/GNUstep/Makefiles/Instance/
+share/GNUstep/Makefiles/Instance/Documentation/
+share/GNUstep/Makefiles/Instance/Documentation/autogsdoc.make
+share/GNUstep/Makefiles/Instance/Documentation/gsdoc.make
+share/GNUstep/Makefiles/Instance/Documentation/install_files.make
+share/GNUstep/Makefiles/Instance/Documentation/javadoc.make
+share/GNUstep/Makefiles/Instance/Documentation/latex.make
+share/GNUstep/Makefiles/Instance/Documentation/texi.make
+share/GNUstep/Makefiles/Instance/Shared/
+share/GNUstep/Makefiles/Instance/Shared/bundle.make
+share/GNUstep/Makefiles/Instance/Shared/headers.make
+share/GNUstep/Makefiles/Instance/Shared/java.make
+share/GNUstep/Makefiles/Instance/Shared/stamp-string.make
+share/GNUstep/Makefiles/Instance/Shared/strings.make
+share/GNUstep/Makefiles/Instance/application.make
+share/GNUstep/Makefiles/Instance/bundle.make
+share/GNUstep/Makefiles/Instance/clibrary.make
+share/GNUstep/Makefiles/Instance/ctool.make
+share/GNUstep/Makefiles/Instance/documentation.make
+share/GNUstep/Makefiles/Instance/framework.make
+share/GNUstep/Makefiles/Instance/gswapp.make
+share/GNUstep/Makefiles/Instance/gswbundle.make
+share/GNUstep/Makefiles/Instance/java-tool.make
+share/GNUstep/Makefiles/Instance/java.make
+share/GNUstep/Makefiles/Instance/library.make
+share/GNUstep/Makefiles/Instance/objc.make
+share/GNUstep/Makefiles/Instance/palette.make
+share/GNUstep/Makefiles/Instance/resource-set.make
+share/GNUstep/Makefiles/Instance/rules.make
+share/GNUstep/Makefiles/Instance/service.make
+share/GNUstep/Makefiles/Instance/subproject.make
+share/GNUstep/Makefiles/Instance/test-application.make
+share/GNUstep/Makefiles/Instance/test-library.make
+share/GNUstep/Makefiles/Instance/test-tool.make
+share/GNUstep/Makefiles/Instance/tool.make
+share/GNUstep/Makefiles/Master/
+share/GNUstep/Makefiles/Master/aggregate.make
+share/GNUstep/Makefiles/Master/application.make
+share/GNUstep/Makefiles/Master/bundle.make
+share/GNUstep/Makefiles/Master/clibrary.make
+share/GNUstep/Makefiles/Master/ctool.make
+share/GNUstep/Makefiles/Master/documentation.make
+share/GNUstep/Makefiles/Master/framework.make
+share/GNUstep/Makefiles/Master/gswapp.make
+share/GNUstep/Makefiles/Master/gswbundle.make
+share/GNUstep/Makefiles/Master/java-tool.make
+share/GNUstep/Makefiles/Master/java.make
+share/GNUstep/Makefiles/Master/library.make
+share/GNUstep/Makefiles/Master/objc.make
+share/GNUstep/Makefiles/Master/palette.make
+share/GNUstep/Makefiles/Master/resource-set.make
+share/GNUstep/Makefiles/Master/rpm.make
+share/GNUstep/Makefiles/Master/rules.make
+share/GNUstep/Makefiles/Master/service.make
+share/GNUstep/Makefiles/Master/source-distribution.make
+share/GNUstep/Makefiles/Master/subproject.make
+share/GNUstep/Makefiles/Master/test-application.make
+share/GNUstep/Makefiles/Master/test-library.make
+share/GNUstep/Makefiles/Master/test-tool.make
+share/GNUstep/Makefiles/Master/tool.make
+share/GNUstep/Makefiles/aggregate.make
+share/GNUstep/Makefiles/app-wrapper.template
+share/GNUstep/Makefiles/application.make
+share/GNUstep/Makefiles/bundle.make
+share/GNUstep/Makefiles/clean_cpu.sh
+share/GNUstep/Makefiles/clean_os.sh
+share/GNUstep/Makefiles/clean_vendor.sh
+share/GNUstep/Makefiles/clibrary.make
+share/GNUstep/Makefiles/common.make
+share/GNUstep/Makefiles/config-noarch.make
+share/GNUstep/Makefiles/config.guess
+share/GNUstep/Makefiles/config.make
+share/GNUstep/Makefiles/config.sub
+share/GNUstep/Makefiles/cpu.sh
+share/GNUstep/Makefiles/ctool.make
+share/GNUstep/Makefiles/documentation.make
+share/GNUstep/Makefiles/empty.make
+share/GNUstep/Makefiles/executable.template
+share/GNUstep/Makefiles/filesystem.csh
+share/GNUstep/Makefiles/filesystem.make
+share/GNUstep/Makefiles/filesystem.sh
+share/GNUstep/Makefiles/fixpath.sh
+share/GNUstep/Makefiles/framework.make
+share/GNUstep/Makefiles/gnustep-make-help
+share/GNUstep/Makefiles/gswapp.make
+share/GNUstep/Makefiles/gswbundle.make
+share/GNUstep/Makefiles/install-sh
+share/GNUstep/Makefiles/java-executable.template
+share/GNUstep/Makefiles/java-tool.make
+share/GNUstep/Makefiles/java.make
+share/GNUstep/Makefiles/jni.make
+share/GNUstep/Makefiles/ld_lib_path.csh
+share/GNUstep/Makefiles/ld_lib_path.sh
+share/GNUstep/Makefiles/library-combo.make
+share/GNUstep/Makefiles/library.make
+share/GNUstep/Makefiles/messages.make
+share/GNUstep/Makefiles/mkinstalldirs
+share/GNUstep/Makefiles/names.make
+share/GNUstep/Makefiles/native-library.make
+share/GNUstep/Makefiles/objc.make
+share/GNUstep/Makefiles/os.sh
+share/GNUstep/Makefiles/palette.make
+share/GNUstep/Makefiles/print_unique_pathlist.sh
+share/GNUstep/Makefiles/relative_path.sh
+share/GNUstep/Makefiles/resource-set.make
+share/GNUstep/Makefiles/rules.make
+share/GNUstep/Makefiles/service.make
+share/GNUstep/Makefiles/spec-rules.template
+share/GNUstep/Makefiles/strip_makefiles.sh
+share/GNUstep/Makefiles/subproject.make
+share/GNUstep/Makefiles/tar-exclude-list
+share/GNUstep/Makefiles/target.make
+share/GNUstep/Makefiles/test-application.make
+share/GNUstep/Makefiles/test-library.make
+share/GNUstep/Makefiles/test-tool.make
+share/GNUstep/Makefiles/tool.make
+share/GNUstep/Makefiles/vendor.sh