[pkgsrc/trunk]: pkgsrc/www/mini_httpd * Fix linkage so that mhtpasswd isn't l...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/mini_httpd * Fix linkage so that mhtpasswd isn't l...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:17:02 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61615e26e93c
branches:  trunk
changeset: 533136:61615e26e93c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 09 02:12:49 2007 +0000

description:
* Fix linkage so that mhtpasswd isn't linked against the OpenSSL libraries.

* None of the source files seems to reference any function in libutil, so
  remove it from the libraries linked into mini_httpd and mhtpasswd.

* Make this work on Solaris by linking mini_httpd with the usual
  "-lnsl -lsocket" dance.

Bump PKGREVISION to 4 due to changed library linkage in the installed
binaries.

diffstat:

 www/mini_httpd/Makefile         |  34 +++++++++-----------------
 www/mini_httpd/distinfo         |   4 +-
 www/mini_httpd/patches/patch-aa |  52 ++++++++++++++++++++++++++++++++--------
 3 files changed, 55 insertions(+), 35 deletions(-)

diffs (143 lines):

diff -r 75539accb081 -r 61615e26e93c www/mini_httpd/Makefile
--- a/www/mini_httpd/Makefile   Sun Sep 09 00:30:13 2007 +0000
+++ b/www/mini_httpd/Makefile   Sun Sep 09 02:12:49 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/09/08 21:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/09 02:12:49 jlam Exp $
 
 DISTNAME=      mini_httpd-1.19
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  http://www.acme.com/software/mini_httpd/
 
@@ -13,31 +13,21 @@
 
 USE_FEATURES=  snprintf
 
-MAKE_ENV+=     PKG_CFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+=     PKG_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=     PKG_LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+=     PKG_LIBS=${LIBS:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-LDFLAGS+=      -lssl -lcrypto -lcrypt
-
-.if ${OPSYS} != "IRIX"
-LDFLAGS+=      -lutil
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=     SYSV_LIBS="-lnsl -lsocket"
 .endif
 
-MAKE_ENV+=     LDLIBS=${LIBS:Q}
-
-INSTALLATION_DIRS=     ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin
-
-do-install:
-       for FILE in mini_httpd.8 htpasswd.1; do \
-               ${MV} -f ${WRKSRC}/$${FILE} ${WRKSRC}/$${FILE}.bak; \
-               ${SED} -e 's/\([^.]\)htpasswd/\1mhtpasswd/g' \
-                       -e 's/^htpasswd/m&/' \
-                       ${WRKSRC}/$${FILE}.bak > ${WRKSRC}/$${FILE}; \
-       done
-       ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${PREFIX}/sbin/
-       ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${PREFIX}/sbin/mhtpasswd
-       ${INSTALL_MAN} ${WRKSRC}/mini_httpd.8 ${PREFIX}/${PKGMANDIR}/man8/
-       ${INSTALL_MAN} ${WRKSRC}/htpasswd.1 ${PREFIX}/${PKGMANDIR}/man1/mhtpasswd.1
+SUBST_CLASSES=         htpasswd
+SUBST_MESSAGE.htpasswd=        Fix name of (m)htpasswd in manual pages.
+SUBST_STAGE.htpasswd=  pre-build
+SUBST_FILES.htpasswd=  htpasswd.1 mini_httpd.8
+SUBST_SED.htpasswd=    -e 's/\([^.]\)htpasswd/\1mhtpasswd/g' -e 's/^htpasswd/m&/'
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 75539accb081 -r 61615e26e93c www/mini_httpd/distinfo
--- a/www/mini_httpd/distinfo   Sun Sep 09 00:30:13 2007 +0000
+++ b/www/mini_httpd/distinfo   Sun Sep 09 02:12:49 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/01/18 16:28:07 reed Exp $
+$NetBSD: distinfo,v 1.6 2007/09/09 02:12:49 jlam Exp $
 
 SHA1 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = b156a5e0b9b6e2169ed772a5890fc63d8ed60514
 RMD160 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 4e8ec41bd9238d49481354bcf9404fb11519a667
 Size (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 42063 bytes
-SHA1 (patch-aa) = 3e30a58fa50283a5b9fe3d272ae312f825a4c8ec
+SHA1 (patch-aa) = f5a32ecaaa64360349853e726bc4787b29a8ceab
 SHA1 (patch-ab) = bf74dd6f6a921024e0dde08eeff39fdf64706414
 SHA1 (patch-ac) = ccbd255aa5b3580426276e8f2fe211deea3feae5
diff -r 75539accb081 -r 61615e26e93c www/mini_httpd/patches/patch-aa
--- a/www/mini_httpd/patches/patch-aa   Sun Sep 09 00:30:13 2007 +0000
+++ b/www/mini_httpd/patches/patch-aa   Sun Sep 09 02:12:49 2007 +0000
@@ -1,29 +1,59 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/03 16:18:55 reed Exp $
+$NetBSD: patch-aa,v 1.2 2007/09/09 02:12:49 jlam Exp $
 
---- Makefile.orig      2002-11-01 16:02:57.000000000 -0700
+--- Makefile.orig      Fri Nov  1 23:02:57 2002
 +++ Makefile
-@@ -15,20 +15,15 @@ CRYPT_LIB =    -lcrypt
+@@ -14,21 +14,23 @@ CRYPT_LIB =    -lcrypt
+ # http://www.openssl.org/  Make sure the SSL_TREE definition points to the
  # tree with your OpenSSL installation - depending on how you installed it,
  # it may be in /usr/local instead of /usr/local/ssl.
- #SSL_TREE =   /usr/local/ssl
+-#SSL_TREE =   /usr/local/ssl
 -#SSL_DEFS =   -DUSE_SSL
+-#SSL_INC =    -I${SSL_TREE}/include
+-#SSL_LIBS =   -L${SSL_TREE}/lib -lssl -lcrypto
++SSL_TREE =    ${PREFIX}
 +SSL_DEFS =    -DUSE_SSL
- #SSL_INC =    -I${SSL_TREE}/include
- #SSL_LIBS =   -L${SSL_TREE}/lib -lssl -lcrypto
++SSL_INC =     -I${SSL_TREE}/include
++SSL_LIBS =    -L${SSL_TREE}/lib -lssl -lcrypto
  
  
 -BINDIR =      /usr/local/sbin
 -MANDIR =      /usr/local/man
--CC =          gcc
 +BINDIR =      ${PREFIX}/sbin
-+MANDIR =      ${PREFIX}/man
++MANDIR =      ${PREFIX}/${PKGMANDIR}
+ CC =          gcc
  CDEFS =               ${SSL_DEFS} ${SSL_INC}
 -CFLAGS =      -O ${CDEFS}
--#CFLAGS =     -g ${CDEFS}
++#CFLAGS =     -O ${CDEFS}
+ #CFLAGS =     -g ${CDEFS}
 -LDFLAGS =     -s
--#LDFLAGS =    -g
++CFLAGS =      ${PKG_CFLAGS} ${CDEFS}
++#LDFLAGS =    -s
+ #LDFLAGS =    -g
 -LDLIBS =      ${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB}
-+CFLAGS =      ${PKG_CFLAGS} ${CDEFS}
++LDFLAGS =     ${PKG_LDFLAGS}
++LDLIBS =      ${SSL_LIBS} ${SYSV_LIBS} ${CRYPT_LIB} ${PKG_LIBS}
  
  all:          mini_httpd htpasswd
  
+@@ -72,14 +74,13 @@ mini_httpd.pem:    mini_httpd.cnf
+ 
+ 
+ install:      all
+-      rm -f ${BINDIR}/mini_httpd ${BINDIR}/htpasswd
+-      -mkdir -p ${BINDIR}
+-      cp mini_httpd htpasswd ${BINDIR}
+-      rm -f ${MANDIR}/man8/mini_httpd.8 ${MANDIR}/man1/htpasswd.1
+-      -mkdir -p ${MANDIR}/man8
+-      cp mini_httpd.8 ${MANDIR}/man8
+-      -mkdir -p ${MANDIR}/man1
+-      cp htpasswd.1 ${MANDIR}/man1
++      ${BSD_INSTALL_PROGRAM_DIR} ${BINDIR}
++      ${BSD_INSTALL_PROGRAM} mini_httpd ${BINDIR}/mini_httpd
++      ${BSD_INSTALL_PROGRAM} htpasswd ${BINDIR}/mhtpasswd
++      ${BSD_INSTALL_MAN_DIR} ${MANDIR}/man8
++      ${BSD_INSTALL_MAN} mini_httpd.8 ${MANDIR}/man8/mini_httpd.8
++      ${BSD_INSTALL_MAN_DIR} ${MANDIR}/man1
++      ${BSD_INSTALL_MAN} htpasswd.1 ${MANDIR}/man1/mhtpasswd.1
+ 
+ clean:
+       rm -f mini_httpd mime_encodings.h mime_types.h htpasswd mini_httpd.rnd *.o core core.* *.core

Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/boost-build Fix multiple PLIST problems; dunno h...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of security/sudo pacakge to 1.6.9p5.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/boost-build Fix multiple PLIST problems; dunno h...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of security/sudo pacakge to 1.6.9p5.
Indexes:

Home | Main Index | Thread Index | Old Index