summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiedi <wiedi@pkgsrc.org>2015-12-18 19:54:14 +0000
committerwiedi <wiedi@pkgsrc.org>2015-12-18 19:54:14 +0000
commit8704733f9fad39de084cf7136d15991beed46e6f (patch)
tree4f11204d66ced1fdd6ba6508bc1ee2dec9f58bb9
parent867d94c2a7e50600b918b6058afce82693957bbd (diff)
downloadpkgsrc-8704733f9fad39de084cf7136d15991beed46e6f.tar.gz
Fix previous attempt of passing LDFLAGS
Ok joerg@
-rw-r--r--net/dhisd/Makefile9
-rw-r--r--net/dhisd/distinfo3
-rw-r--r--net/dhisd/patches/patch-Makefile27
3 files changed, 30 insertions, 9 deletions
diff --git a/net/dhisd/Makefile b/net/dhisd/Makefile
index 3e151c26ee6..c6fab0a5c29 100644
--- a/net/dhisd/Makefile
+++ b/net/dhisd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/12/13 02:29:13 wiedi Exp $
+# $NetBSD: Makefile,v 1.20 2015/12/18 19:54:14 wiedi Exp $
#
DISTNAME= dhisd-5.5
@@ -14,13 +14,6 @@ LDFLAGS.SunOS+= -lsocket -lnsl
INSTALLATION_DIRS= bin share/examples/dhisd share/doc/dhisd
-SUBST_CLASSES+= prefix
-SUBST_FILES.prefix= Makefile
-SUBST_STAGE.prefix= pre-configure
-SUBST_MESSAGE.prefix= Convert /usr/local to ${PREFIX}
-SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|;'
-SUBST_SED.prefix+= -e '/LFLAGS/s|${PREFIX}|${PREFIX}/lib -Wl,-rpath,${PREFIX} ${LDFLAGS}|;'
-
SUBST_CLASSES+= varbase
SUBST_FILES.varbase= dhisd.h README
SUBST_STAGE.varbase= pre-configure
diff --git a/net/dhisd/distinfo b/net/dhisd/distinfo
index 9fc7944f37f..cbac39a7535 100644
--- a/net/dhisd/distinfo
+++ b/net/dhisd/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 00:34:58 agc Exp $
+$NetBSD: distinfo,v 1.8 2015/12/18 19:54:14 wiedi Exp $
SHA1 (dhisd-5.5.tar.gz) = 0bbd230d3947f3d21505db43db4dfd2281a04a86
RMD160 (dhisd-5.5.tar.gz) = 48053e9627490fcd8a5b2de706ca4333a3e4be02
SHA512 (dhisd-5.5.tar.gz) = ac50bb7ce15aadea2bd2f912f8ecb092d798af3ce76f6c06f7b60826a09c3d22fed9ba4d5dd46df89a3829551d543bc4e1d53c8d72a34f4fabfa5eaa8ded64a3
Size (dhisd-5.5.tar.gz) = 26221 bytes
+SHA1 (patch-Makefile) = 6665639ac14e2d4898b1e8bea5b0b08f69a9c7ca
SHA1 (patch-README) = b6ebc61ce419f89da44cfca00715bc65ef26a56d
SHA1 (patch-ab) = f5a4315245cbf32aac88e183b3c2a86100ec3e08
diff --git a/net/dhisd/patches/patch-Makefile b/net/dhisd/patches/patch-Makefile
new file mode 100644
index 00000000000..9030a44ca3c
--- /dev/null
+++ b/net/dhisd/patches/patch-Makefile
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile,v 1.1 2015/12/18 19:54:14 wiedi Exp $
+Make sure files are installed into PREFIX and pass our LDFLAGS.
+
+--- Makefile.orig 2008-05-22 14:14:08.000000000 +0000
++++ Makefile
+@@ -39,16 +39,16 @@ WFLAGS=-Wall -Wstrict-prototypes -Wpoint
+ # Possible CFLAGS: -g -O3 -DDONT_FORK
+ #
+
+-CFLAGS= -O3 $(WFLAGS) -I. -I/usr/local/include # $(MYSQL_INCLUDE) -DWITH_MYSQL=1
+-LFLAGS= -L/usr/local/lib # $(MYSQL_LIBDIR)
++CFLAGS= -O3 $(WFLAGS) -I. -I$(PREFIX)/include # $(MYSQL_INCLUDE) -DWITH_MYSQL=1
++LFLAGS= $(LDFLAGS) # $(MYSQL_LIBDIR)
+
+ # For System V (Solaris) add -lnsl and -lsocket
+ # For MySQL support add -lmysqlclient
+ LIBS=-lgmp # -lmysqlclient #-lnsl -lsocket
+
+-INSTALLBIN=/usr/local/sbin
+-INSTALLCONF=/usr/local/etc
+-INSTALLRC=/usr/local/etc/rc.d
++INSTALLBIN=$(PREFIX)/sbin
++INSTALLCONF=$(PREFIX)/etc
++INSTALLRC=$(PREFIX)/etc/rc.d
+ LOGDIR=/var/log/dhis
+ PIDDIR=/var/run/dhis
+ CP=cp