pkg/48820: [maintainer update] wm/ctwm to 3.8.2

[rhialto%falu.nl@localhost]

>Number:         48820
>Category:       pkg
>Synopsis:       [maintainer update] wm/ctwm to 3.8.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun May 18 21:05:00 +0000 2014
>Originator:     Rhialto
>Release:        NetBSD 6.1.1
>Organization:
        
>Environment:
        
        
System: NetBSD murthe.falu.nl 6.1.1 NetBSD 6.1.1 (MURTHE6.1.1) #4: Sat Sep 28 
12:38:49 CEST 2013 
rhialto%murthe.falu.nl@localhost:/usr/src/sys/arch/amd64/compile/MURTHE6.1.1 
amd64
Architecture: x86_64
Machine: amd64
>Description:
        There is a new release of ctwm.
>How-To-Repeat:
        Read the new homepage at http://ctwm.org/.
>Fix:
        This is a patch for the Makefile and distinfo.
        The patchfiles in patches/* can all be removed.

        Is PKG_INSTALLATION_TYPES still needed?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ctwm/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile    15 Aug 2013 20:26:51 -0000      1.32
+++ Makefile    18 May 2014 20:50:08 -0000
@@ -1,34 +1,48 @@
 # $NetBSD: Makefile,v 1.32 2013/08/15 20:26:51 rillig Exp $
 #
 
-DISTNAME=      ctwm-3.8.1
+DISTNAME=      ctwm-3.8.2
 CATEGORIES=    x11 wm
-MASTER_SITES=  http://ctwm.free.lp.se/dist/
+MASTER_SITES=  http://ctwm.org/dist/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    rhialto%falu.nl@localhost
-HOMEPAGE=      http://ctwm.free.lp.se/
+HOMEPAGE=      http://ctwm.org/
 COMMENT=       Window manager with support for multiple virtual screens and 
Gnome 1.x
 
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_IMAKE=     YES
+LICENSE=       mit
 
 .include "../../mk/bsd.prefs.mk"
 
-# We need an m4 that understands the -s option.
-USE_TOOLS+=            gm4:run
 OPSYSVARS+=            EXTRA_DEFINES
-EXTRA_DEFINES+=                -DPATH_TO_M4=\"${TOOLS_PATH.gm4:Q}\"
 # The __EXTENSIONS__ is needed for sigjmp_buf.
 EXTRA_DEFINES.SunOS+=  -D__EXTENSIONS__
 MAKE_ENV+=             EXTRA_DEFINES=${EXTRA_DEFINES:Q}
 AUTO_MKDIRS=           yes
 
+# We need an m4 that understands the -s option. NetBSD's knows it since 6.0.
+# Do a quick test.
+m4out != echo OK | m4 -s
+.if (${m4out} == "OK")
+WANT_GM4 = 0
+.else
+WANT_GM4 = 1
+USE_TOOLS+=    gm4:run
+.endif
+
 pre-configure:
        ( ${ECHO} 'USER_JPEGLIBDIR = -L${JPEGBASE}/lib 
${COMPILER_RPATH_FLAG}${JPEGBASE}/lib'; \
          ${ECHO} 'USER_JPEGINCDIR = -I${JPEGBASE}/include'; \
          ${CAT} ${WRKSRC}/Imakefile.local-template; \
        ) >${WRKSRC}/Imakefile.local
+.if ${WANT_GM4}
+       ( ${ECHO} '#undef M4_CMD'; \
+         ${ECHO} '#define M4_CMD ${TOOLS_PATH.gm4}' \
+       ) >>${WRKSRC}/Imakefile.local
+.endif
 
 pre-install:
 .for f in example.ctwmrc levitte.ctwmrc peterc.ctwmrc system.ctwmrc 
system.ctwmrc.gnome
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ctwm/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo    9 Jun 2013 15:26:45 -0000       1.16
+++ distinfo    18 May 2014 20:50:08 -0000
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.16 2013/06/09 15:26:45 ryoon Exp $
 
-SHA1 (ctwm-3.8.1.tar.gz) = 4844b352457d4f7ffda7c5b80ae744c30a46806a
-RMD160 (ctwm-3.8.1.tar.gz) = 5990ed604fadaa6ad484f6b3221278a4f6fcb34e
-Size (ctwm-3.8.1.tar.gz) = 737958 bytes
-SHA1 (patch-aa) = 5f6d7f7d5552815cd40a2d2d1a43a9a22a202037
-SHA1 (patch-ac) = bb4cbcb8e4a68d1f2844aa16e85918aa5368a869
+SHA1 (ctwm-3.8.2.tar.xz) = b1bb8c75c4896738686c1f42222be20508ea2cb2
+RMD160 (ctwm-3.8.2.tar.xz) = e5fc23208e019814388e6336ad7af80f1c208238
+Size (ctwm-3.8.2.tar.xz) = 549984 bytes

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- The Doctor: No, 'eureka' is Greek for
\X/ rhialto/at/xs4all.nl    -- 'this bath is too hot.'

>Unformatted: