summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/magic/Makefile8
-rw-r--r--cad/magic/distinfo18
-rw-r--r--cad/magic/patches/patch-ai6
-rw-r--r--cad/magic/patches/patch-aj4
-rw-r--r--cad/magic/patches/patch-ar4
-rw-r--r--cad/magic/patches/patch-as4
-rw-r--r--cad/magic/patches/patch-au4
-rw-r--r--cad/magic/patches/patch-av4
-rw-r--r--cad/magic/patches/patch-ay4
-rw-r--r--cad/magic/patches/patch-az4
-rw-r--r--chat/mu-conference/Makefile30
-rw-r--r--sysutils/webmin/Makefile14
-rw-r--r--textproc/p5-XML-Sablotron/Makefile14
13 files changed, 60 insertions, 58 deletions
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 75db3d93896..7aac756db8b 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/01/25 22:21:09 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/03 02:19:42 rillig Exp $
#
DISTNAME= magic-7.1
@@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://vlsi.cornell.edu/magic/
COMMENT= Integrated circuit layout system
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake printf
USE_GNU_READLINE= # uses rl_*_completion_function
MAKE_ENV+= MAGIC_HOME=${PREFIX:Q}
@@ -24,7 +24,7 @@ CPPFLAGS+= -DIS_LITTLE_ENDIAN
.include "../../mk/x11.buildlink3.mk"
post-patch:
- cd ${WRKSRC} && for f in `${FIND} . -type f -exec ${GREP} -l CAD_HOME {} /dev/null \;` ; do \
+ cd ${WRKSRC} && for f in `${FIND} . -type f -exec ${GREP} -l CAD_HOME {} /dev/null \\;` ; do \
${ECHO} "Replacing CAD_HOME in $$f" ; \
${MV} -f $$f $$f.bak ; ${SED} 's;CAD_HOME;MAGIC_HOME;g' $$f.bak > $$f ; \
${RM} $$f.bak ; \
@@ -32,7 +32,7 @@ post-patch:
${CHMOD} 755 ${WRKSRC}/scripts/config
do-configure:
- cd ${WRKSRC} && printf "1\n2\n6\n\n\n\n\n\n\n\n\n\n\n" | \
+ cd ${WRKSRC} && ${PRINTF} '1\n2\n6\n\n\n\n\n\n\n\n\n\n\n' | \
${SETENV} ${MAKE_ENV} ./scripts/config
.include "../../devel/readline/buildlink3.mk"
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index 6fbaa95322b..9870396e4cd 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/01/13 18:46:06 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/02/03 02:19:42 rillig Exp $
SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101
RMD160 (magic-7.1.tar.gz) = 7ab03ba23243817b168254f8c6f7a50d8ea2a4db
@@ -11,8 +11,8 @@ SHA1 (patch-ae) = 27555db8f06d1f8a7a6f002e7dfccf14a4db2765
SHA1 (patch-af) = 415c0252b38dab9460697e2b3d87af83518ea980
SHA1 (patch-ag) = b8dcf69daab42dfd24bdb2038733f88f269cc7dc
SHA1 (patch-ah) = 31654bb19cf41bbd07d8ecd3d8b5c529684638a2
-SHA1 (patch-ai) = 8c79ca61705f1ae02019fc964ac64a9a72c314f2
-SHA1 (patch-aj) = d86b45ec676b2acd1631a18635f3e989b3f87f34
+SHA1 (patch-ai) = 2957ca1596b267d4476ab38893c23c8f14b2660d
+SHA1 (patch-aj) = bc04ec87ba55efc44438e240a07c16e9f029ba9d
SHA1 (patch-ak) = 18c5a23f334c9878160c104d12be4f4e71da6d59
SHA1 (patch-al) = 1ef7780a48da86d690b9cf8a31bd9dc416087a09
SHA1 (patch-am) = c4e695c370db01775b321970a327ea0851fdf437
@@ -20,12 +20,12 @@ SHA1 (patch-an) = 83e9e5242b483f398962a6237551b860749e70f0
SHA1 (patch-ao) = 747c18b5e997d652054d17acbdb1fee0748d77a8
SHA1 (patch-ap) = b2b9e1c45dbefd1d93205bcc15ea713c38181598
SHA1 (patch-aq) = 8ca051b61a8d79988838be4c1bc4dca3eed6bcaa
-SHA1 (patch-ar) = 898b58351cc567e184b128da0ad669744859bebf
-SHA1 (patch-as) = 2b574c0f2c81a3fd0c7982f84dad5bdbdbd0811b
+SHA1 (patch-ar) = 1d9b4c63dd6156fc02dfcbdd946ecca3d44847f2
+SHA1 (patch-as) = 5ddeac5797f34b6e951241e4d891efd0aea5f15d
SHA1 (patch-at) = 6caeb2a9c455792b4ec0930b199df4880f42ce47
-SHA1 (patch-au) = a21eee3003b818f7d097eb9c7d87882d2c66283d
-SHA1 (patch-av) = 14422e1d0d714762c95890d850b149223d157944
+SHA1 (patch-au) = 37f6106787f363e1d40b8feb8c2b1912dd987c71
+SHA1 (patch-av) = 5c5bc8a5add515ab2d9d55bbf96b5c23e1a178a6
SHA1 (patch-aw) = 557bf1993732183b6738ec12539736ebd9aaa900
SHA1 (patch-ax) = 8bc1938b4435d7724a666ad283c0aef93abdabf1
-SHA1 (patch-ay) = b31fee8531d37d07a0e3eab89b6526508c7e7199
-SHA1 (patch-az) = cc7a6cf8edd61f5f553be4fd390ca28d63dc89fd
+SHA1 (patch-ay) = 8555fe87e07468bdefd0b1e6c0855d9d0572f843
+SHA1 (patch-az) = 59373bad51817333b3c82b0a35e34e39dc60ea21
diff --git a/cad/magic/patches/patch-ai b/cad/magic/patches/patch-ai
index 60f65a2ed6f..22fab144fb7 100644
--- a/cad/magic/patches/patch-ai
+++ b/cad/magic/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2006/02/03 02:19:42 rillig Exp $
--- extflat/EFread.c.orig 2001-01-12 22:12:35.000000000 +0000
+++ extflat/EFread.c
-@@ -24,7 +24,7 @@ static char rcsid[] = "$Header: /ufs/rep
+@@ -24,7 +24,7 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.2 2006/01/06 18:14:06 joerg Exp $
#include "misc/magic.h"
#include "utils/geometry.h"
#include "utils/hash.h"
-@@ -33,6 +33,9 @@ static char rcsid[] = "$Header: /ufs/rep
+@@ -33,6 +33,9 @@
#include "extflat/EFint.h"
#include "misc/paths.h"
diff --git a/cad/magic/patches/patch-aj b/cad/magic/patches/patch-aj
index 1f2dbeaf469..59a5a5c56a5 100644
--- a/cad/magic/patches/patch-aj
+++ b/cad/magic/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2006/02/03 02:19:42 rillig Exp $
--- graphics/grMain.c.orig 2001-04-16 14:43:40.000000000 +0000
+++ graphics/grMain.c
-@@ -117,14 +117,7 @@ static char rcsid[]="$Header: /ufs/repos
+@@ -117,14 +117,7 @@
#ifdef SUNVIEW
#include <pixrect/pixrect.h>
#endif
diff --git a/cad/magic/patches/patch-ar b/cad/magic/patches/patch-ar
index 6a433b44f30..449e4da34cd 100644
--- a/cad/magic/patches/patch-ar
+++ b/cad/magic/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-ar,v 1.2 2006/02/03 02:19:42 rillig Exp $
--- database/DBio.c.orig 2005-12-20 16:39:18.000000000 +0000
+++ database/DBio.c
-@@ -46,7 +46,6 @@ static char rcsid[] = "$Header: /ufs/rep
+@@ -46,7 +46,6 @@
#include "utils/malloc.h"
#include "signals/signals.h"
diff --git a/cad/magic/patches/patch-as b/cad/magic/patches/patch-as
index 980178c7bab..3f427ba003d 100644
--- a/cad/magic/patches/patch-as
+++ b/cad/magic/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-as,v 1.2 2006/02/03 02:19:42 rillig Exp $
--- drc/DRCmain.c.orig 2005-12-20 16:40:25.000000000 +0000
+++ drc/DRCmain.c
-@@ -35,8 +35,6 @@ static char rcsid[] = "$Header: /ufs/rep
+@@ -35,8 +35,6 @@
#include "drc/drc.h"
#include "undo/undo.h"
diff --git a/cad/magic/patches/patch-au b/cad/magic/patches/patch-au
index 3668c06ff11..bbaa8e3c631 100644
--- a/cad/magic/patches/patch-au
+++ b/cad/magic/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.1 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-au,v 1.2 2006/02/03 02:19:42 rillig Exp $
--- textio/txCommands.c.orig 2005-12-20 16:51:34.000000000 +0000
+++ textio/txCommands.c
-@@ -46,8 +46,6 @@ static char rcsid[]="$Header: /ufs/repos
+@@ -46,8 +46,6 @@
#include "utils/utils.h"
#include "lisp/lisp.h"
diff --git a/cad/magic/patches/patch-av b/cad/magic/patches/patch-av
index eaa29f7dfb3..7e4ab4c5d78 100644
--- a/cad/magic/patches/patch-av
+++ b/cad/magic/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-av,v 1.2 2006/02/03 02:19:42 rillig Exp $
--- textio/txMain.c.orig 2001-04-16 14:43:50.000000000 +0000
+++ textio/txMain.c
-@@ -22,4 +22,5 @@ static char rcsid[]="$Header: /ufs/repos
+@@ -22,4 +22,5 @@
#endif not lint
+#include <sys/types.h>
diff --git a/cad/magic/patches/patch-ay b/cad/magic/patches/patch-ay
index 9f01f82c64f..bb091f11cb7 100644
--- a/cad/magic/patches/patch-ay
+++ b/cad/magic/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-ay,v 1.2 2006/02/03 02:19:42 rillig Exp $
--- resis/ResRex.c.orig 2005-12-20 17:21:13.000000000 +0000
+++ resis/ResRex.c
-@@ -10,7 +10,7 @@ static char rcsid[] = "$Header: /ufs/rep
+@@ -10,7 +10,7 @@
/* It is hard to get the value of MAXFLOAT in a portable manner. */
#if defined(ibm032) || defined(CYGWIN)
#define MAXFLOAT ((float)3.40282346638528860e+38)
diff --git a/cad/magic/patches/patch-az b/cad/magic/patches/patch-az
index b2bf1df205b..38d7dc78880 100644
--- a/cad/magic/patches/patch-az
+++ b/cad/magic/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.1 2006/01/13 18:46:06 joerg Exp $
+$NetBSD: patch-az,v 1.2 2006/02/03 02:19:42 rillig Exp $
--- textio/txInput.c.orig 2006-01-13 18:28:21.000000000 +0000
+++ textio/txInput.c
-@@ -26,9 +26,7 @@ static char rcsid[]="$Header: /ufs/repos
+@@ -26,9 +26,7 @@
#include <unistd.h>
#include <ctype.h>
#include <dirent.h>
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index fd20a196756..dac0a1aed15 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/03 02:24:07 rillig Exp $
#
DISTNAME= mu-conference-0.6.0
@@ -19,8 +19,10 @@ XMLCONFIG= ${WRKDIR}/${DISTNAME}/muc-jcr.xml
USE_TOOLS+= gmake pkg-config
-PKG_SYSCONFSUBDIR= jabberd
-RCD_SCRIPTS= muc
+PKG_SYSCONFSUBDIR= jabberd
+RCD_SCRIPTS= muc
+
+.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= JABBERD_USER JABBERD_LOGDIR JABBERD_PIDDIR
JABBERD_USER?= jabberd
@@ -29,29 +31,29 @@ FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
EGDIR= ${PREFIX}/share/examples/jabberd
-CONF_FILES+= ${EGDIR}/muc-jcr.xml ${PKG_SYSCONFDIR}/muc-jcr.xml
+CONF_FILES+= ${EGDIR:Q}/muc-jcr.xml ${PKG_SYSCONFDIR:Q}/muc-jcr.xml
INSTALLATION_DIRS= bin
post-extract:
- @${MV} ${XMLCONFIG} ${XMLCONFIG}.in
+ @${MV} ${XMLCONFIG:Q} ${XMLCONFIG:Q}.in
pre-configure:
- @${SED} -e "s|\(<logdir>\)[^<]*|\1${JABBERD_LOGDIR}|g" \
- -e "s|\(<pidfile>\).|\1${JABBERD_PIDDIR}|g" \
- -e "s|\(<spool>\).|\1${JABBERD_SPOOLDIR}|g" \
- ${XMLCONFIG}.in > ${XMLCONFIG}
+ @${SED} -e 's|\(<logdir>\)[^<]*|\1${JABBERD_LOGDIR}|g' \
+ -e 's|\(<pidfile>\).|\1${JABBERD_PIDDIR}|g' \
+ -e 's|\(<spool>\).|\1${JABBERD_SPOOLDIR}|g' \
+ ${XMLCONFIG:Q}.in > ${XMLCONFIG:Q}
pre-build:
- cd ${WRKDIR} ; ${PAX} -rw -pe ${DISTNAME} ${WRKSRC}
+ cd ${WRKDIR:Q} && ${PAX} -rw -pe ${DISTNAME:Q} ${WRKSRC:Q}
post-build:
- ${CP} ${WRKSRC}/src/main.c ${WRKSRC}/src/jcomp.mk ${SUBWRKSRC}
- cd ${SUBWRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -f jcomp.mk
+ ${CP} ${WRKSRC:Q}/src/main.c ${WRKSRC:Q}/src/jcomp.mk ${SUBWRKSRC:Q}
+ cd ${SUBWRKSRC:Q} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f jcomp.mk
do-install:
- ${INSTALL_PROGRAM} ${SUBWRKSRC}/mu-conference ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/muc-jcr.xml ${EGDIR}
+ ${INSTALL_PROGRAM} ${SUBWRKSRC:Q}/mu-conference ${PREFIX:Q}/bin
+ ${INSTALL_DATA} ${WRKSRC:Q}/${DISTNAME:Q}/muc-jcr.xml ${EGDIR:Q}
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 901c271903a..de1f43bc51f 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/29 06:22:18 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/03 02:04:27 rillig Exp $
DISTNAME= webmin-1.170-minimal
PKGNAME= ${DISTNAME:S/-minimal$//}
@@ -17,7 +17,7 @@ USE_LANGUAGES= # empty
NO_BUILD= yes
USE_TOOLS+= perl:run
-REPLACE_PERL= *.cgi */*.cgi *.pl */*.pl
+REPLACE_PERL+= *.cgi */*.cgi *.pl */*.pl
WEBMIN_DIR= ${PREFIX}/${WEBMIN_SUBDIR}
WEBMIN_SUBDIR= share/webmin
@@ -26,22 +26,22 @@ WEBMIN_LOGDIR?= ${VARBASE}/log/webmin
FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q}
FILES_SUBST+= WEBMIN_ETCDIR=${WEBMIN_ETCDIR:Q}
FILES_SUBST+= WEBMIN_LOGDIR=${WEBMIN_LOGDIR:Q}
-MESSAGE_SUBST+= WEBMIN_DIR=${WEBMIN_DIR}
+MESSAGE_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q}
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
RCD_SCRIPTS= webmin
OWN_DIRS= ${WEBMIN_LOGDIR}
# Dynamically generate the Webmin PLIST from the installed files.
-WEBMIN_PLIST_FILES= \
+WEBMIN_PLIST_FILES_CMD= \
( cd ${PREFIX}; ${FIND} ${WEBMIN_SUBDIR} \! -type d -print ) \
| ${SORT} -u
-WEBMIN_PLIST_DIRS= \
+WEBMIN_PLIST_DIRS_CMD= \
( cd ${PREFIX}; ${FIND} ${WEBMIN_SUBDIR} -type d -print ) \
| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/," \
- -e "s,$$, 2>/dev/null || ${TRUE}," \
+ -e "s,\$$, 2>/dev/null || ${TRUE}," \
| ${SORT} -ur
-GENERATE_PLIST+= ${WEBMIN_PLIST_FILES}; ${WEBMIN_PLIST_DIRS};
+GENERATE_PLIST+= ${WEBMIN_PLIST_FILES_CMD}; ${WEBMIN_PLIST_DIRS_CMD};
do-configure:
for file in ${WRKSRC}/setup.sh; do \
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 1a774fb4836..df46d3a4d5b 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/03 01:58:43 rillig Exp $
DISTNAME= XML-Sablotron-0.98
PKGNAME= p5-${DISTNAME}
@@ -26,12 +26,12 @@ PERL5_PACKLIST= auto/XML/Sablotron/.packlist
.include "../../lang/perl5/module.mk"
post-patch:
- @${MV} ${WRKSRC}/Makefile.PL ${WRKSRC}/Makefile.PL.orig
+ @${MV} ${WRKSRC:Q}/Makefile.PL ${WRKSRC:Q}/Makefile.PL.orig
@${SED} \
- -e "s|^\(my \$$expat_libpath = '\)\(';\)$$|\1${EXPATLIBPATH}\2|" \
- -e "s|^\(my \$$expat_incpath = '\)\(';\)$$|\1${EXPATINCPATH}\2|" \
- -e "s|^\(my \$$sablot_libpath = '\)\(';\)$$|\1${SABLOTLIBPATH}\2|" \
- -e "s|^\(my \$$sablot_incpath = '\)\(';\)$$|\1${SABLOTINCPATH}\2|" \
- ${WRKSRC}/Makefile.PL.orig > ${WRKSRC}/Makefile.PL
+ -e 's|^\(my \$$expat_libpath = '\)\(';\)$$|\1${EXPATLIBPATH}\2|' \
+ -e 's|^\(my \$$expat_incpath = '\)\(';\)$$|\1${EXPATINCPATH}\2|' \
+ -e 's|^\(my \$$sablot_libpath = '\)\(';\)$$|\1${SABLOTLIBPATH}\2|' \
+ -e 's|^\(my \$$sablot_incpath = '\)\(';\)$$|\1${SABLOTINCPATH}\2|' \
+ ${WRKSRC:Q}/Makefile.PL.orig > ${WRKSRC:Q}/Makefile.PL
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 13:04:34 +0000