CVS commit: pkgsrc/net/wmget

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 12 20:46:24 UTC 2023

Modified Files:
        pkgsrc/net/wmget: Makefile distinfo
Added Files:
        pkgsrc/net/wmget/patches: patch-Makefile patch-dockapp_Makefile

Log Message:
wmget: Set LICENSE. Honour CFLAGS/LDFLAGS.

Expected to fix the build on various platforms, particularly since
it used Werror before.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/wmget/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/wmget/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/wmget/patches/patch-Makefile \
    pkgsrc/net/wmget/patches/patch-dockapp_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wmget/Makefile
diff -u pkgsrc/net/wmget/Makefile:1.38 pkgsrc/net/wmget/Makefile:1.39
--- pkgsrc/net/wmget/Makefile:1.38      Wed Apr 19 08:11:15 2023
+++ pkgsrc/net/wmget/Makefile   Wed Jul 12 20:46:24 2023
@@ -1,30 +1,21 @@
-# $NetBSD: Makefile,v 1.38 2023/04/19 08:11:15 adam Exp $
+# $NetBSD: Makefile,v 1.39 2023/07/12 20:46:24 nia Exp $
 
 DISTNAME=      wmget-0.6.0-src
 PKGNAME=       ${DISTNAME:S/-src//}
 WRKSRC=                ${WRKDIR}/wmget
-PKGREVISION=   29
+PKGREVISION=   30
 CATEGORIES=    net
 MASTER_SITES=  http://amtrickey.net/download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://amtrickey.net/wmget/index.html
 COMMENT=       Background download manager in a Window Maker dock app
-
-SUBST_CLASSES+=                ldflags
-SUBST_MESSAGE.ldflags= Fixing hardcoded LDFLAGS.
-SUBST_STAGE.ldflags=   pre-configure
-SUBST_FILES.ldflags=   Makefile
-SUBST_SED.ldflags=     -e 's|^LDFLAGS=|&${LDFLAGS}|'
-
-SUBST_CLASSES+=                paths
-SUBST_MESSAGE.paths=   Fixing hardcoded paths.
-SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     Makefile
-SUBST_SED.paths=       -e 's|^PREFIX=.*|PREFIX=${LOCALBASE}|'
+LICENSE=       mit
 
 USE_TOOLS+=    gmake
 
+MAKE_FLAGS+=   PREFIX=${PREFIX}
+
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 do-install:

Index: pkgsrc/net/wmget/distinfo
diff -u pkgsrc/net/wmget/distinfo:1.6 pkgsrc/net/wmget/distinfo:1.7
--- pkgsrc/net/wmget/distinfo:1.6       Tue Oct 26 11:07:11 2021
+++ pkgsrc/net/wmget/distinfo   Wed Jul 12 20:46:24 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:07:11 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/07/12 20:46:24 nia Exp $
 
 BLAKE2s (wmget-0.6.0-src.tar.gz) = d104fe0b89c13ed43753f44194a5105849a4e290ceed65426ede7374c13ecbf4
 SHA512 (wmget-0.6.0-src.tar.gz) = 18ce66925473eefc5e4e174450abb0505d3cf85f8d1d242faa5608d6c9dfd34464c771dcf2ee1da3df2f59241f7f0a4d63fc0f8783bfb454a82777a248179e88
 Size (wmget-0.6.0-src.tar.gz) = 41155 bytes
+SHA1 (patch-Makefile) = c0ff63fe6fcb39daa8ada74eeaa6bffec0cae37e
 SHA1 (patch-aa) = cdcab9a51b4e688f49d78e2307d0752c33705f06
+SHA1 (patch-dockapp_Makefile) = d67f3620f1edd92b9608655053b823a0f79fa55e
 SHA1 (patch-dockapp_da_run.c) = 53815436dfa015d8eb434693ff98cc002a73ffd2

Added files:

Index: pkgsrc/net/wmget/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/wmget/patches/patch-Makefile:1.1
--- /dev/null   Wed Jul 12 20:46:24 2023
+++ pkgsrc/net/wmget/patches/patch-Makefile     Wed Jul 12 20:46:24 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.1 2023/07/12 20:46:24 nia Exp $
+
+Append, don't set LDFLAGS, to ensure the environment is honoured.
+
+--- Makefile.orig      2023-07-12 20:41:37.017940349 +0000
++++ Makefile
+@@ -50,11 +50,9 @@ PREFIX=/usr/pkg
+ INSTALLDIR=   install -d -m 755
+ INSTALLBIN=   install -m 555
+ INSTALLMAN=   install -m 444
+-CC=           gcc
+-CFLAGS=               -Wall -W -I/usr/X11R6/include -O
+ # The following line is what I use during development
+ #CFLAGS:=     $(CFLAGS) -Werror -g 
+-LDFLAGS=      -L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl
++LDFLAGS+=     -lXpm -lXext -lX11 -lm -lcurl
+ DOCS=         wmget.1
+ 
+ VERSION:=     $(shell grep '\#define WMGET_VERSION ' wmget.h \
Index: pkgsrc/net/wmget/patches/patch-dockapp_Makefile
diff -u /dev/null pkgsrc/net/wmget/patches/patch-dockapp_Makefile:1.1
--- /dev/null   Wed Jul 12 20:46:24 2023
+++ pkgsrc/net/wmget/patches/patch-dockapp_Makefile     Wed Jul 12 20:46:24 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-dockapp_Makefile,v 1.1 2023/07/12 20:46:24 nia Exp $
+
+Append, don't set LDFLAGS, to ensure that the environment is honoured.
+
+--- dockapp/Makefile.orig      2003-02-09 03:08:07.000000000 +0000
++++ dockapp/Makefile
+@@ -22,8 +22,7 @@
+ 
+ DAOBJS=               da_run.o da_x.o da_mouse.o
+ 
+-CFLAGS=               -ansi -Wall -W -Werror -g
+-LDFLAGS=      -L/usr/X11R6/lib -lXpm -lXext -lX11
++LDFLAGS+=     -lXpm -lXext -lX11
+ 
+ dockapp.a:    $(DAOBJS)
+               ar rcsv dockapp.a $(DAOBJS)