[pkgsrc/trunk]: pkgsrc/devel/gnustep-make Changes 1.11.2:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8a531b55813
branches:  trunk
changeset: 506479:d8a531b55813
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Jan 17 07:35:55 2006 +0000

description:
Changes 1.11.2:

The `GNUstep.conf' file is now viewed as the essential determination of
the install location for GNUstep libraries, tools and other files.
During configuration, this file is read, if it exists, to determine
this information. This can still be overriden with environment and
command line options, however. See the filesystem documentation in the
GNUstep Make Documentation directory for more information.

   You no longer need to source GNUstep.sh in order to compile GNUstep
programs. All that is needed is the definition of GNUSTEP_MAKEFILES.
You should also have the GNUstep system tools directory in your path.

   All netbsd systems are assumed to use ELF libraries. Support for the
old static libs version of netbsd was removed.

   Serveral new options were added to configure to change the location
of basic dir locations and basic configuration files. Also, the help was
greatly improved. Note that -prefix=/usr/GNUstep/System no longer
works.  Please use -prefix=/usr/GNUstep or
-with-system-root=/usr/GNUstep/System.

   A few more fixes for cygwin are included as well as Windows resource
rules.

   Support for ObjC++ has been added. You should list the ObjC++ .mm
files in the xxx_OBJCC_FILES variable, and put extra ObjC++ flags in
xxx_OBJCCFLAGS or ADDITIONAL_OBJCCFLAGS.

diffstat:

 devel/gnustep-make/Makefile         |  17 ++++++++---------
 devel/gnustep-make/PLIST            |   5 ++---
 devel/gnustep-make/buildlink3.mk    |   4 ++--
 devel/gnustep-make/distinfo         |  15 +++++++--------
 devel/gnustep-make/patches/patch-ab |  22 ----------------------
 devel/gnustep-make/patches/patch-ac |  27 +++------------------------
 devel/gnustep-make/patches/patch-ad |   6 +++---
 devel/gnustep-make/patches/patch-ae |  13 ++++---------
 8 files changed, 29 insertions(+), 80 deletions(-)

diffs (198 lines):

diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/Makefile
--- a/devel/gnustep-make/Makefile       Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/Makefile       Tue Jan 17 07:35:55 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2006/01/12 18:36:22 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/17 07:35:55 adam Exp $
 
-DISTNAME=      gnustep-make-1.11.1
-PKGREVISION=   1
+DISTNAME=      gnustep-make-1.11.2
 CATEGORIES=    devel gnustep
 MASTER_SITES=  ${MASTER_SITE_GNUSTEP:=core/}
 
@@ -11,16 +10,16 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-CONFIGURE_ENV+=        INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
+GNU_CONFIGURE=         yes
+CONFIGURE_ENV+=                INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
 
 .include "../../mk/x11.buildlink3.mk"
 .include "gnustep.mk"
 
-post-patch:
-       ${CP} ${WRKSRC}/target.make ${WRKSRC}/target.make.bak
-       ${SED}  -e 's;/usr/pkg;${LOCALBASE};g' \
-               -e 's;@object_fmt@;${LOWER_OPSYS}-${OBJECT_FMT};g' \
-               ${WRKSRC}/target.make.bak > ${WRKSRC}/target.make
+SUBST_CLASSES+=                target
+SUBST_STAGE.target=    post-patch
+SUBST_FILES.target=    target.make
+SUBST_SED.target+=     -e 's|/usr/pkg|${LOCALBASE}|g'
 
 post-install:
        ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/GNUstep/Local/Applications
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/PLIST
--- a/devel/gnustep-make/PLIST  Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/PLIST  Tue Jan 17 07:35:55 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/07/29 12:57:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/01/17 07:35:55 adam Exp $
 share/GNUstep/System/Library/Makefiles/GNUstep-reset.sh
 share/GNUstep/System/Library/Makefiles/GNUstep.csh
 share/GNUstep/System/Library/Makefiles/GNUstep.sh
@@ -109,7 +109,6 @@
 share/GNUstep/System/Library/Makefiles/test-tool.make
 share/GNUstep/System/Library/Makefiles/tool.make
 share/GNUstep/System/Library/Makefiles/transform_paths.sh
-share/GNUstep/System/Library/Makefiles/user_home
 share/GNUstep/System/Library/Makefiles/vendor.sh
 share/GNUstep/System/Library/Makefiles/which_lib
 share/GNUstep/System/Tools/debugapp
@@ -191,4 +190,4 @@
 @exec ${MKDIR} %D/share/GNUstep/Local/Applications
 @dirrm share/GNUstep/Local/Applications
 @dirrm share/GNUstep/Local
-@dirrm share/GNUstep
+@unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/buildlink3.mk
--- a/devel/gnustep-make/buildlink3.mk  Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/buildlink3.mk  Tue Jan 17 07:35:55 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/09/27 00:36:32 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/17 07:35:55 adam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GNUSTEP_MAKE_BUILDLINK3_MK:=   ${GNUSTEP_MAKE_BUILDLINK3_MK}+
@@ -110,4 +110,4 @@
 
 .endif # GNUSTEP_MAKE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/distinfo
--- a/devel/gnustep-make/distinfo       Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/distinfo       Tue Jan 17 07:35:55 2006 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.15 2006/01/12 18:36:22 joerg Exp $
+$NetBSD: distinfo,v 1.16 2006/01/17 07:35:55 adam Exp $
 
-SHA1 (gnustep-make-1.11.1.tar.gz) = 7ce34b5515a1c79d32ca86abd27ce94f731d6b53
-RMD160 (gnustep-make-1.11.1.tar.gz) = 4664e14b0d9656d948bd896414ddebeec6a2537a
-Size (gnustep-make-1.11.1.tar.gz) = 380768 bytes
+SHA1 (gnustep-make-1.11.2.tar.gz) = 8557a1c79389a47d71860dd138eebdd6c88bbc0d
+RMD160 (gnustep-make-1.11.2.tar.gz) = d92d81363b2b57df50a3069e3f1a5695645270e5
+Size (gnustep-make-1.11.2.tar.gz) = 395036 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ab) = ee585d5bb5d12f72dff3f0fd3f4c356a8522da38
-SHA1 (patch-ac) = 28295d2cd954e6a1a0491f9b780a9af9843691b8
-SHA1 (patch-ad) = ff910b36c23968db43818c46859d0711ce3054fa
-SHA1 (patch-ae) = b7af49c45fed5fb72a7b455b533a23e78f6f20ce
+SHA1 (patch-ac) = 89ef9d05f3059443b3bf262b2efb1c6679d62708
+SHA1 (patch-ad) = 9815debc95e9abf056b791560f32b41d4369cf2f
+SHA1 (patch-ae) = 72b446e914a59b8cfe4d5edc164fa33bc8ea3c4b
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/patches/patch-ab
--- a/devel/gnustep-make/patches/patch-ab       Mon Jan 16 23:35:29 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/11/24 02:37:32 rh Exp $
-
---- user_home.c.orig   2004-09-04 06:27:56.000000000 +1000
-+++ user_home.c
-@@ -140,6 +140,7 @@ int main (int argc, char** argv)
- #endif /* HAVE_GETEUID */
-       struct passwd *pwent = getpwuid (uid);
-       loginName = pwent->pw_name;
-+      pw = pwent;
- #endif /* HAVE_GETPWUID */
- #endif
-       if (loginName == 0)
-@@ -150,7 +151,9 @@ int main (int argc, char** argv)
-     }
- 
- #if !defined(__MINGW__)
-+#if !HAVE_GETPWUID
-   pw = getpwnam (loginName);
-+#endif
-   if (pw == 0)
-     {
-       fprintf(stderr, "Unable to locate home directory for '%s'\n", loginName);
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/patches/patch-ac
--- a/devel/gnustep-make/patches/patch-ac       Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/patches/patch-ac       Tue Jan 17 07:35:55 2006 +0000
@@ -1,29 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2006/01/12 18:36:22 joerg Exp $
+$NetBSD: patch-ac,v 1.6 2006/01/17 07:35:55 adam Exp $
 
---- target.make.orig   2005-09-19 03:37:15.000000000 +0000
+--- target.make.orig   2005-12-06 11:54:03.000000000 +0100
 +++ target.make
-@@ -674,9 +674,9 @@ endif
- 
- ####################################################
- #
--# NetBSD
-+# NetBSD a.out
- #
--ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
-+ifeq (@object_fmt@,netbsd-a.out)
- # This is disabled temporarily, because I don't know exactly how
- # to link shared libs. Everything seems to link correctly now but
- # constructor functions in the shared lib failed to get called
-@@ -708,7 +708,7 @@ endif
- #
- # NetBSD ELF
- #
--ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf)
-+ifeq (@object_fmt@,netbsd-ELF)
- HAVE_SHARED_LIBS    = yes
- SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
- SHARED_LIB_LINK_CMD = \
-@@ -739,6 +739,39 @@ endif
+@@ -711,6 +711,39 @@ endif
  
  ####################################################
  #
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/patches/patch-ad
--- a/devel/gnustep-make/patches/patch-ad       Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/patches/patch-ad       Tue Jan 17 07:35:55 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2005/07/29 12:57:14 adam Exp $
+$NetBSD: patch-ad,v 1.4 2006/01/17 07:35:55 adam Exp $
 
---- configure.orig     2005-03-10 04:21:17.000000000 +0000
+--- configure.orig     2005-12-20 17:39:33.000000000 +0100
 +++ configure
-@@ -4833,7 +4833,7 @@ echo $ECHO_N "checking if the compiler s
+@@ -5113,7 +5113,7 @@ echo $ECHO_N "checking if the compiler s
  
  # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x
  
diff -r 9426783e4fd7 -r d8a531b55813 devel/gnustep-make/patches/patch-ae
--- a/devel/gnustep-make/patches/patch-ae       Mon Jan 16 23:35:29 2006 +0000
+++ b/devel/gnustep-make/patches/patch-ae       Tue Jan 17 07:35:55 2006 +0000
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2003/12/17 14:55:58 sketch Exp $
+$NetBSD: patch-ae,v 1.2 2006/01/17 07:35:55 adam Exp $
 
---- GNUmakefile.in.orig        2003-12-16 17:56:20.509350958 +0000
-+++ GNUmakefile.in     2003-12-16 17:56:41.441185161 +0000
-@@ -111,11 +111,11 @@
+--- GNUmakefile.in.orig        2005-11-28 22:07:45.000000000 +0100
++++ GNUmakefile.in
+@@ -113,7 +113,7 @@ all: generated-files which_lib$(EXEEXT)
  # used. (I mean: 'cd core/make; cd ..; mkdir make-build; cd
  # make-build; ../make/configure --disable-import; make;' must work)
  which_lib$(EXEEXT): which_lib.c config.h
 -      $(CC) @CFLAGS@ -Wall -I. -o $@ $<
 +      $(CC) @CFLAGS@ -I. -o $@ $<
  
- user_home$(EXEEXT): user_home.c config.h
-       $(CC) @CFLAGS@ -DGNUSTEP_SYSTEM_ROOT=$(GNUSTEP_SYSTEM_ROOT) \
--            -Wall -I. -o $@ $<
-+            -I. -o $@ $<
- 
  ifeq ($(messages),yes)
    EC =