CVS commit: pkgsrc/textproc/xmlindent

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 24 20:41:04 UTC 2025

Modified Files:
        pkgsrc/textproc/xmlindent: distinfo
        pkgsrc/textproc/xmlindent/patches: patch-Makefile
Added Files:
        pkgsrc/textproc/xmlindent/patches: patch-Makefile.orig

Log Message:
textproc/xmlindent: Fix makefile dependencies.

Resolves:

===> Building for xmlindent-0.2.16nb1
cc -O2 -c error.c
cc -O2 -c indent.c
indent.c:38:10: fatal error: lex.yy.c: No such file or directory
 #include "lex.yy.c"
          ^~~~~~~~~~
compilation terminated.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/xmlindent/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/xmlindent/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xmlindent/patches/patch-Makefile.orig

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

Modified files:

Index: pkgsrc/textproc/xmlindent/distinfo
diff -u pkgsrc/textproc/xmlindent/distinfo:1.6 pkgsrc/textproc/xmlindent/distinfo:1.7
--- pkgsrc/textproc/xmlindent/distinfo:1.6      Tue Jul 11 05:46:30 2023
+++ pkgsrc/textproc/xmlindent/distinfo  Fri Jan 24 20:41:04 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2023/07/11 05:46:30 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/01/24 20:41:04 riastradh Exp $
 
 BLAKE2s (xmlindent-0.2.16.tar.gz) = c89734fd8d45ac9e6aadc0e27512a326f7699328eb4f4d7c3535ce14ab202c44
 SHA512 (xmlindent-0.2.16.tar.gz) = 019f1e431c920b93762747865927df2816bf8e93bc2d856658ab07cacf4d0daa6d8b4c159be90e65bbff174c8270420082f089cb9166cb03b3d1cc68cee9b4fd
 Size (xmlindent-0.2.16.tar.gz) = 17657 bytes
-SHA1 (patch-Makefile) = 2b324a5a6ee939499666f9f475e4a1a6aebb4133
+SHA1 (patch-Makefile) = b37cb4b412f6cc700a6ccde443a91acbc69d4279

Index: pkgsrc/textproc/xmlindent/patches/patch-Makefile
diff -u pkgsrc/textproc/xmlindent/patches/patch-Makefile:1.1 pkgsrc/textproc/xmlindent/patches/patch-Makefile:1.2
--- pkgsrc/textproc/xmlindent/patches/patch-Makefile:1.1        Tue Jul 11 05:46:30 2023
+++ pkgsrc/textproc/xmlindent/patches/patch-Makefile    Fri Jan 24 20:41:04 2025
@@ -1,23 +1,27 @@
-$NetBSD: patch-Makefile,v 1.1 2023/07/11 05:46:30 nia Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/01/24 20:41:04 riastradh Exp $
 
 Honour CFLAGS/LDFLAGS, properly separate compile and link
 stages.
 
 --- Makefile.orig      2004-03-28 19:59:07.000000000 +0000
 +++ Makefile
-@@ -4,8 +4,13 @@ PREFIX=/usr/local
+@@ -4,10 +4,16 @@ PREFIX=/usr/local
  BIN_INSTALL_DIR=$(PREFIX)/bin
  MAN_INSTALL_DIR=$(PREFIX)/share/man/man1
  
 -xmlindent: lexer
 -      gcc -Wall -g error.c indent.c buffer.c main.c -o xmlindent -lfl
 +OBJS= error.o indent.o buffer.o main.o
-+
+ 
+-lexer:
++$(OBJS): lex.yy.c
 +.c.o:
 +      $(CC) $(CFLAGS) -c $<
 +
-+xmlindent: $(OBJS) lexer 
++xmlindent: $(OBJS)
 +      $(CC) $(LDFLAGS) $(OBJS) -o xmlindent -lfl
- 
- lexer:
++
++lex.yy.c:
        flex xmlindent.yy
+ 
+ install: xmlindent

Added files:

Index: pkgsrc/textproc/xmlindent/patches/patch-Makefile.orig
diff -u /dev/null pkgsrc/textproc/xmlindent/patches/patch-Makefile.orig:1.1
--- /dev/null   Fri Jan 24 20:41:04 2025
+++ pkgsrc/textproc/xmlindent/patches/patch-Makefile.orig       Fri Jan 24 20:41:04 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile.orig,v 1.1 2025/01/24 20:41:04 riastradh Exp $
+
+Honour CFLAGS/LDFLAGS, properly separate compile and link
+stages.
+
+--- Makefile.orig      2004-03-28 19:59:07.000000000 +0000
++++ Makefile
+@@ -4,8 +4,13 @@ PREFIX=/usr/local
+ BIN_INSTALL_DIR=$(PREFIX)/bin
+ MAN_INSTALL_DIR=$(PREFIX)/share/man/man1
+ 
+-xmlindent: lexer
+-      gcc -Wall -g error.c indent.c buffer.c main.c -o xmlindent -lfl
++OBJS= error.o indent.o buffer.o main.o
++
++.c.o:
++      $(CC) $(CFLAGS) -c $<
++
++xmlindent: $(OBJS) lexer 
++      $(CC) $(LDFLAGS) $(OBJS) -o xmlindent -lfl
+ 
+ lexer:
+       flex xmlindent.yy