pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc - remove hardcoded /usr/pkg in patch, simplify
details: https://anonhg.NetBSD.org/pkgsrc/rev/a948a3fcbf7e
branches: trunk
changeset: 497598:a948a3fcbf7e
user: grant <grant%pkgsrc.org@localhost>
date: Sun Jul 31 14:03:28 2005 +0000
description:
- remove hardcoded /usr/pkg in patch, simplify
- honour CPPFLAGS, LDFLAGS, LIBS
- needs -lnsl -lsocket on Solaris
diffstat:
misc/open2300-mysql/Makefile | 6 ++++-
misc/open2300/distinfo | 4 +-
misc/open2300/patches/patch-aa | 48 ++++++++++++++++++++---------------------
3 files changed, 30 insertions(+), 28 deletions(-)
diffs (104 lines):
diff -r b086ed96926e -r a948a3fcbf7e misc/open2300-mysql/Makefile
--- a/misc/open2300-mysql/Makefile Sun Jul 31 13:35:37 2005 +0000
+++ b/misc/open2300-mysql/Makefile Sun Jul 31 14:03:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/31 13:35:37 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/31 14:03:28 grant Exp $
#
PKGNAME= ${DISTNAME:S/-/-mysql-/}
@@ -10,5 +10,9 @@
BUILD_TARGET= mysql2300
INSTALL_TARGET= install-mysql
+LIBS+= -lmysqlclient
+LIBS.SunOS+= -lnsl -lsocket
+MAKE_ENV+= LIBS=${LIBS:Q}
+
.include "../../mk/mysql.buildlink3.mk"
.include "../open2300/Makefile.common"
diff -r b086ed96926e -r a948a3fcbf7e misc/open2300/distinfo
--- a/misc/open2300/distinfo Sun Jul 31 13:35:37 2005 +0000
+++ b/misc/open2300/distinfo Sun Jul 31 14:03:28 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 11:02:56 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/07/31 14:03:28 grant Exp $
SHA1 (open2300-1.8.tar.gz) = 86fd2dcdef995498ed17062dd4b8df5db6b3383d
RMD160 (open2300-1.8.tar.gz) = d0b7618cfa7d0ea92708d949fd4521311627865f
Size (open2300-1.8.tar.gz) = 330320 bytes
-SHA1 (patch-aa) = 3f2cc9994e45a77d2bfc6907515e5c7c4a6d13d3
+SHA1 (patch-aa) = 9bdd5011c60b2af676d9f86b96e18d67cad6bf0d
SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9
SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795
diff -r b086ed96926e -r a948a3fcbf7e misc/open2300/patches/patch-aa
--- a/misc/open2300/patches/patch-aa Sun Jul 31 13:35:37 2005 +0000
+++ b/misc/open2300/patches/patch-aa Sun Jul 31 14:03:28 2005 +0000
@@ -1,44 +1,42 @@
-$NetBSD: patch-aa,v 1.3 2004/11/29 08:22:27 martin Exp $
+$NetBSD: patch-aa,v 1.4 2005/07/31 14:03:28 grant Exp $
---- Makefile.orig 2004-11-13 01:25:31.000000000 +0100
-+++ Makefile 2004-11-29 09:12:16.000000000 +0100
-@@ -4,7 +4,7 @@
- # Default locations are
- # 1. Path to config file including filename given as parameter
- # 2. ./open2300.conf
--# 3. /usr/local/etc/open2300.conf
-+# 3. ${SYSCONFDIR}/open2300.conf
- # 4. /etc/open2300.conf
- #
- # This makefile is made for Linux.
-@@ -12,7 +12,7 @@
- #
- # You may want to adjust the 3 directories below
+--- Makefile.orig 2004-11-13 11:25:31.000000000 +1100
++++ Makefile
+@@ -14,11 +14,11 @@
+
+ prefix = /usr/local
+ exec_prefix = ${prefix}
+-bindir = ${exec_prefix}/bin
++bindir = ${PREFIX}/bin
--prefix = /usr/local
-+prefix = ${PREFIX}
- exec_prefix = ${prefix}
- bindir = ${exec_prefix}/bin
+ #########################################
-@@ -37,7 +37,7 @@
+-CC = gcc
++#CC = gcc
+ OBJ = open2300.o rw2300.o linux2300.o win2300.o
+ LOGOBJ = log2300.o rw2300.o linux2300.o win2300.o
+ FETCHOBJ = fetch2300.o rw2300.o linux2300.o win2300.o
+@@ -37,8 +37,8 @@ MINMAXOBJ = minmax2300.o rw2300.o linux2
VERSION = 1.8
-CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\"
-+CFLAGS += -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(PKG_SYSCONFDIR)\" -I /usr/pkg/include/mysql
- CC_LDFLAGS = -lm
+-CC_LDFLAGS = -lm
++CFLAGS += -DVERSION=\"$(VERSION)\" ${CPPFLAGS}
++CC_LDFLAGS = ${LDFLAGS} ${LIBS} -lm
CC_WINFLAG =
# For Windows - comment the two line above and un-comment the two lines below.
-@@ -80,7 +80,7 @@
+ # CC_LDFLAGS = -lwsock32 -fno-exceptions -s
+@@ -80,7 +80,7 @@ xml2300 : $(XMLOBJ)
$(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
mysql2300: $(MYSQLOBJ)
- $(CC) $(CFLAGS) -o $@ $(MYSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient
-+ $(CC) $(CFLAGS) -o $@ $(MYSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -L/usr/pkg/lib/mysql -Wl,-R/usr/pkg/lib/mysql -lmysqlclient
++ $(CC) $(CFLAGS) -o $@ $(MYSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
light2300: $(LIGHTOBJ)
$(CC) $(CFLAGS) -o $@ $(LIGHTOBJ) $(CC_LDFLAGS)
-@@ -92,19 +92,23 @@
+@@ -92,19 +92,23 @@ minmax2300: $(MINMAXOBJ)
$(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
install:
Home |
Main Index |
Thread Index |
Old Index