[pkgsrc/trunk]: pkgsrc/www/screws Multiple fixes:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/screws Multiple fixes:
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:30:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4827b9098c3
branches:  trunk
changeset: 490806:e4827b9098c3
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Mar 20 17:27:31 2005 +0000

description:
Multiple fixes:
- Let the used user and group be customized through  SCREWS_USER and
  SCREW_GROUPS.
- Fix usage of PKG_USERS, which broke the build as seen in bulk build logs.
- Fix handling of configuration file (stale files could be left before in
  ${PREFIX}/etc).
- Honour VARBASE.
- Do not hardcode /usr/pkg in patches.
- Fix the "hsml" module so that it can find the lua library (missing rpaths).

Bump PKGREVISION to 3 due to all the previous changes.

Most of this brokenness was present since the package was first imported.
(Oh man, I hate packages reinventing the wheel when it comes to the build
infrastructure...  I'm sure it's still not clean enough.)

diffstat:

 www/screws/Makefile         |  18 ++++++++++++++----
 www/screws/distinfo         |   9 ++++++---
 www/screws/patches/patch-aa |  21 ++++++++++++---------
 www/screws/patches/patch-ab |   4 ++--
 www/screws/patches/patch-ac |  23 +++++++++++++++++++++++
 www/screws/patches/patch-ad |  13 +++++++++++++
 www/screws/patches/patch-ae |  22 ++++++++++++++++++++++
 7 files changed, 92 insertions(+), 18 deletions(-)

diffs (197 lines):

diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/Makefile
--- a/www/screws/Makefile       Sun Mar 20 17:22:50 2005 +0000
+++ b/www/screws/Makefile       Sun Mar 20 17:27:31 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:50 reed Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/20 17:27:31 jmmv Exp $
 #
 
 DISTNAME=      screws-0.54
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  ftp://ftp.nopcode.org/prj/screws/
 
@@ -14,8 +14,12 @@
 USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 
-PKG_USERS=     screws
-PKG_GROUPS=    www
+BUILD_DEFS+=   SCREWS_USER SCREWS_GROUP
+
+PKG_USERS=     ${SCREWS_USER}:${SCREWS_GROUP}
+PKG_GROUPS=    ${SCREWS_GROUP}
+
+MAKE_ENV+=     ETCPREFIX=${PKG_SYSCONFDIR}
 
 EGDIR=         ${PREFIX}/share/examples
 CONF_FILES=    ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/screws.conf
@@ -23,6 +27,12 @@
 
 RCD_SCRIPTS=   screws
 
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   "Fixing paths."
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     src/Utils/screwsctl
+SUBST_SED.paths=       -e 's|/var/log|${VARBASE}/log|g'
+
 .include "../../lang/lua/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/distinfo
--- a/www/screws/distinfo       Sun Mar 20 17:22:50 2005 +0000
+++ b/www/screws/distinfo       Sun Mar 20 17:27:31 2005 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 14:08:38 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/03/20 17:27:31 jmmv Exp $
 
 SHA1 (screws-0.54.tar.gz) = 87114e17d14f092e943a3a29345a532cfa7e3ca5
 RMD160 (screws-0.54.tar.gz) = 2cc982caae8559656f2249b52d555ecf83531c29
 Size (screws-0.54.tar.gz) = 828711 bytes
-SHA1 (patch-aa) = e66df78e90ab66cc51060bfeea1f807d95256fc6
-SHA1 (patch-ab) = 5149e050e7eb7b675a97bbf1a789178b0550d853
+SHA1 (patch-aa) = 12cb94a4756b640179958f19d5a84292dd7eebe2
+SHA1 (patch-ab) = a557558437eaa43d36feb4b72dc84c45c4931cfa
+SHA1 (patch-ac) = 7d0542f65b24ba9d7ed035c140d7165a19b2f73d
+SHA1 (patch-ad) = 984fa51aff7d17ba69f3ea1c0b9cf4bbb70e3973
+SHA1 (patch-ae) = 94e0bdce03ee1437188260f6598bd275d3dd381e
diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/patches/patch-aa
--- a/www/screws/patches/patch-aa       Sun Mar 20 17:22:50 2005 +0000
+++ b/www/screws/patches/patch-aa       Sun Mar 20 17:27:31 2005 +0000
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/09/16 18:45:09 he Exp $
+$NetBSD: patch-aa,v 1.4 2005/03/20 17:27:31 jmmv Exp $
 
---- Makefile.orig      Mon May 31 12:56:24 2004
+--- Makefile.orig      2004-05-31 12:56:24.000000000 +0200
 +++ Makefile
-@@ -55,9 +55,9 @@ install: all
+@@ -53,11 +53,11 @@ install: all
+       install -d -m 0755 ${PREFIX}/share/examples/screws
+       install -d -m 0755 ${MODULE_PATH}
        #install -d -m 0755 ${PREFIX}/libexec/screws/modules
-       install -d -m 0755 ${PREFIX}/man/man8 ${PREFIX}/etc ${PREFIX}/var/log
+-      install -d -m 0755 ${PREFIX}/man/man8 ${PREFIX}/etc ${PREFIX}/var/log
++      install -d -m 0755 ${PREFIX}/man/man8 #${PREFIX}/etc ${PREFIX}/var/log
        @echo "==> Installing binaries"
 -      install -m 0755 src/Utils/screwsctl ${PREFIX}/sbin/
 -      install -m 0755 src/Server/screwsd  ${PREFIX}/sbin/
@@ -15,7 +18,7 @@
        @echo "==> Installing standard includes for HSML"
        mkdir -p ${DIP}
        cp -rf ./src/Hsml/hsml-inc/* ${DIP}/
-@@ -71,16 +71,16 @@ install: all
+@@ -71,17 +71,14 @@ install: all
        @echo "==> Examples Documentation and Example files"
        @for A in doc/server/* ; do \
        echo ... $$A ; \
@@ -28,15 +31,15 @@
 -      install -m 0644 doc/manpage/screws.conf.5 ${PREFIX}/man/man5/screws.conf.5
 -      install -m 0644 conf/*.conf ${PREFIX}/share/examples/screws/
 -      install -m 0644 src/Utils/mime.types ${PREFIX}/share/screws/
+-      if [ ! -e "${CFGFILE}" ] ; then \
+-      install -m 0644 conf/default.conf ${CFGFILE} ; \
+-      fi
 +      install -c -m 0644 doc/images/screws.png ${PREFIX}/share/doc/screws/
 +      install -c -m 0644 doc/manpage/screwsd.8 ${PREFIX}/man/man8/screwsd.8
 +      install -c -m 0644 doc/manpage/screwsctl.1 ${PREFIX}/man/man1/screwsctl.1
 +      install -c -m 0644 doc/manpage/screws.conf.5 ${PREFIX}/man/man5/screws.conf.5
 +      install -c -m 0644 conf/*.conf ${PREFIX}/share/examples/screws/
 +      install -c -m 0644 src/Utils/mime.types ${PREFIX}/share/screws/
-       if [ ! -e "${CFGFILE}" ] ; then \
--      install -m 0644 conf/default.conf ${CFGFILE} ; \
-+      install -c -m 0644 conf/default.conf ${CFGFILE} ; \
-       fi
        @echo ; \
        echo "***************************************" \
+            "***************************************"; \
diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/patches/patch-ab
--- a/www/screws/patches/patch-ab       Sun Mar 20 17:22:50 2005 +0000
+++ b/www/screws/patches/patch-ab       Sun Mar 20 17:27:31 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2004/11/22 00:09:46 kristerw Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/20 17:27:31 jmmv Exp $
 
 --- src/Server/Makefile.orig   Mon Nov 22 01:04:00 2004
 +++ src/Server/Makefile        Mon Nov 22 01:04:44 2004
@@ -7,7 +7,7 @@
         case "`uname`" in \
        "NetBSD"|"FreeBSD"|"OpenBSD") \
 -       echo -L/usr/pkg/lib -lssl -lcrypto >> .opts ;; \
-+       echo -L/usr/pkg/lib -R/usr/pkg/lib -lssl -lcrypto >> .opts ;; \
++       echo -L${PREFIX}/lib -R${PREFIX}/lib -lssl -lcrypto >> .opts ;; \
        *) \
         echo -lssl >> .opts ; esac ; fi
        @if [ "`uname`" = "Linux" ]; then echo " * USE_DLOPEN" ; \
diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/screws/patches/patch-ac       Sun Mar 20 17:27:31 2005 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2005/03/20 17:27:31 jmmv Exp $
+
+--- src/Server/Accept.c.orig   2004-06-05 15:33:56.000000000 +0200
++++ src/Server/Accept.c
+@@ -14,9 +14,8 @@
+ int tcpwin;
+ 
+ /* memmem */
+-#ifndef __linux__
+ char *
+-memmem(buf,len1,str,len2)
++custom_memmem(buf,len1,str,len2)
+       char *buf;
+       int len1;
+       char *str;
+@@ -35,7 +34,6 @@ memmem(buf,len1,str,len2)
+       }
+       return (char *)0; // not found
+ }
+-#endif
+ 
+ /* Main Accept function, here we handle connections */
+ int
diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/screws/patches/patch-ad       Sun Mar 20 17:27:31 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/03/20 17:27:31 jmmv Exp $
+
+--- src/Server/Headers.c.orig  2004-06-05 15:34:40.000000000 +0200
++++ src/Server/Headers.c
+@@ -220,7 +220,7 @@ void screws_heads_parse(s,b,head,nheads)
+                       /* copy data into memory */
+                       begin+=4;
+               printf("BEIGN(%s)\n",begin);
+-              printf("FOUND(%s)\n",memmem(begin,strlen(begin),token,strlen(token)));
++              printf("FOUND(%s)\n",custom_memmem(begin,strlen(begin),token,strlen(token)));
+               
+                       filesize= clength-(begin-CONTENT)-tokenlen; 
+                       printf("FILESIZE(%d)\n",filesize);
diff -r b2e4442ba2c4 -r e4827b9098c3 www/screws/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/screws/patches/patch-ae       Sun Mar 20 17:27:31 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2005/03/20 17:27:31 jmmv Exp $
+
+--- src/Hsml/Makefile.orig     2004-05-22 23:16:38.000000000 +0200
++++ src/Hsml/Makefile
+@@ -7,7 +7,7 @@ DEBUG=-g
+ DEFS+=  -DINCORE_LUA=${INCORE_LUA}
+ DEFS+=        -DPATH_JAVA=\"${JAVA}\"
+ DEFS+=        -DPATH_
+-CFLAGS= -I/usr/pkg/include -I/usr/local/include ${DEBUG} ${DEFS}
++CFLAGS+= ${DEBUG} ${DEFS}
+ 
+ %.o: %.c
+       @echo "[hsml] $<"
+@@ -15,7 +15,7 @@ CFLAGS= -I/usr/pkg/include -I/usr/local/
+ 
+ all: opts ${OBJ}
+       @echo "[hsml] LINKING..."
+-      @${CC} ${CFLAGS} ${OBJ} -o ${BIN} `cat .opts`
++      @${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} -o ${BIN} `cat .opts`
+       @echo "-----------------"
+ 
+ clean:
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/fragroute Use BUILDLINK_PREFIX.libdnet rather...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/screws Update to 0.56, latest stable version. Als...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/fragroute Use BUILDLINK_PREFIX.libdnet rather...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/screws Update to 0.56, latest stable version. Als...
Indexes:
Home | Main Index | Thread Index | Old Index