cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move post-patch to pre-configure (fixes make update-patches); ok sturm@

Browse Source
This commit is contained in:
david 2006-02-05 15:08:43 +00:00
parent 0a3341ad25
commit 2404b10130
6 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/sqsh/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2004/11/22 16:59:30 espie Exp $
# $OpenBSD: Makefile,v 1.14 2006/02/05 15:08:43 david Exp $
DISTNAME= sqsh-2.1
PKGNAME= ${DISTNAME}p0
@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-readline --sysconfdir='${SYSCONFDIR}'
ALL_TARGET=
NO_REGRESS= Yes
post-patch:
pre-configure:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/Makefile.in \
${WRKSRC}/src/Makefile.in

5
russian/cyrproxy/Makefile
View File

@ -1,9 +1,10 @@
# $FreeBSD: ports/russian/cyrproxy/Makefile,v 1.4 1999/08/31 01:46:57 peter Exp $
# $OpenBSD: Makefile,v 1.16 2004/12/02 21:14:45 alek Exp $
# $OpenBSD: Makefile,v 1.17 2006/02/05 15:08:43 david Exp $
COMMENT= "cyrillic proxy for network protocols"
DISTNAME= cyrproxy-1.4.2
PKGNAME= ${DISTNAME}p0
CATEGORIES= russian net www
MASTER_SITES= ftp://ftp.lexa.ru/pub/domestic/lexa/
@ -18,7 +19,7 @@ WANTLIB= c
NO_REGRESS= Yes
post-patch:
pre-configure:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/Makefile
do-install:

11
russian/cyrproxy/patches/patch-Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.3 2004/01/04 23:37:27 espie Exp $
$OpenBSD: patch-Makefile,v 1.4 2006/02/05 15:08:43 david Exp $
--- Makefile.orig 2001-02-08 23:33:53.000000000 +0100
+++ Makefile 2004-01-05 00:34:41.000000000 +0100
@@ -6,9 +6,9 @@
@ -14,6 +14,15 @@ $OpenBSD: patch-Makefile,v 1.3 2004/01/04 23:37:27 espie Exp $
# Some systems contains resolver routines in libresolv
# EXTRALIBS=lresolv
EXTRALIBS=
@@ -34,7 +34,7 @@ SPY=tcpspy
TBLDIR=/usr/local/share/proxy
# config file location
-CONF_FILE=/etc/cyrproxy.conf
+CONF_FILE=%%SYSCONFDIR%%/cyrproxy.conf
# Subdirs for make
# cyrcoder - filter-like cyrillic recoder
@@ -65,7 +65,7 @@ all: ${CYRPROXY} ${SPY} subdirmake confi

4
sysutils/apc-upsd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2004/12/20 10:35:34 alek Exp $
# $OpenBSD: Makefile,v 1.17 2006/02/05 15:08:43 david Exp $
COMMENT= "UPS software for APC UPS models"
@ -21,7 +21,7 @@ MAKE_FLAGS= CFLAGS="${CFLAGS}"
NO_REGRESS= Yes
post-patch:
pre-configure:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/apc_upsd.h
do-install:

6
sysutils/gkrellm/gkrellm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2006/01/22 00:09:30 steven Exp $
# $OpenBSD: Makefile,v 1.25 2006/02/05 15:08:44 david Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@ -7,8 +7,8 @@ COMMENT-client= "single process stack of system monitors for GTK+2"
V= 2.2.4
DISTNAME= gkrellm-${V}
PKGNAME= gkrellm-server-${V}p4
PKGNAME-client= gkrellm-${V}p4
PKGNAME= gkrellm-server-${V}p5
PKGNAME-client= gkrellm-${V}p5
CATEGORIES= sysutils sysutils/gkrellm
HOMEPAGE= http://www.gkrellm.net/

13
sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_h
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-server_gkrellmd_h,v 1.2 2004/05/18 14:49:56 naddy Exp $
--- server/gkrellmd.h.orig 2004-05-05 10:30:52.000000000 -0500
+++ server/gkrellmd.h 2004-05-14 19:27:05.000000000 -0500
$OpenBSD: patch-server_gkrellmd_h,v 1.3 2006/02/05 15:08:44 david Exp $
--- server/gkrellmd.h.orig Mon Sep 6 17:33:14 2004
+++ server/gkrellmd.h Sat Feb 4 07:37:54 2006
@@ -105,9 +105,11 @@
#endif
#if !defined(WIN32)
+#if !defined(GKRELLMD_SYS_ETC)
#define GKRELLMD_SYS_ETC "/etc"
-#define GKRELLMD_SYS_ETC "/etc"
-#define GKRELLMD_LOCAL_ETC "/usr/local/etc"
-#endif
+#if !defined(GKRELLMD_SYS_ETC)
+#define GKRELLMD_SYS_ETC "%%SYSCONFDIR%%"
+#endif /* GKRELLMD_SYS_ETC */
+#define GKRELLMD_LOCAL_ETC "/etc"
+#define GKRELLMD_LOCAL_ETC "%%SYSCONFDIR%%"
+#endif /* WIN32 */