diff options
author | jlam <jlam> | 2005-12-30 16:39:39 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-12-30 16:39:39 +0000 |
commit | c65c4c4323831a73890c28310d68612ca6bb9ef2 (patch) | |
tree | 771dc8ab9af22e010264b2e79afb13018b8d30e8 | |
parent | d026fa7a24e1bfc7f9b343eed860836569a369d3 (diff) | |
download | pkgsrc-c65c4c4323831a73890c28310d68612ca6bb9ef2.tar.gz |
Remove some unnecessary patches that removed targets to install the
configuration files. It's easier just to override the installation
destination during the install phase by setting INSTALL_MAKE_FLAGS.
-rw-r--r-- | databases/freetds/Makefile | 10 | ||||
-rw-r--r-- | databases/freetds/distinfo | 4 | ||||
-rw-r--r-- | databases/freetds/patches/patch-aa | 18 | ||||
-rw-r--r-- | databases/freetds/patches/patch-ab | 15 |
4 files changed, 4 insertions, 43 deletions
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 84f2da2911a..1845835b445 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/12/29 06:21:35 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/30 16:39:39 jlam Exp $ DISTNAME= freetds-0.63 PKGREVISION= 2 @@ -21,16 +21,12 @@ CONFIGURE_ARGS+= --with-tdsver=7.0 # no thread-safe resolver functions on NetBSD CONFIGURE_ARGS+= --disable-threadsafe +INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} ETC=${EGDIR:Q} + EGDIR= ${PREFIX}/share/examples/freetds CONF_FILES= ${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf CONF_FILES+= ${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf CONF_FILES+= ${EGDIR}/pool.conf ${PKG_SYSCONFDIR}/pool.conf -post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/locales.conf ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/src/pool/pool.conf ${EGDIR} - .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index 2c9863cfd89..867321574bc 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.13 2005/10/13 18:05:31 rillig Exp $ +$NetBSD: distinfo,v 1.14 2005/12/30 16:39:39 jlam Exp $ SHA1 (freetds-0.63.tar.gz) = b95e630524800155af8fa04e78b5b834120cf48f RMD160 (freetds-0.63.tar.gz) = ee132f757f698cfc8dabc612012eb8f2486e66dd Size (freetds-0.63.tar.gz) = 1321466 bytes -SHA1 (patch-aa) = 1fd449d758b9791bac8561bf3831b548b649fa3f -SHA1 (patch-ab) = 6634d7358481d8a89cdf1112c7e1173b4206d448 SHA1 (patch-ac) = f757e56e3229ba268af73ac4779887a47b70cbef SHA1 (patch-ad) = 0cb1e544c43eb316b59efab700ac4735433297a9 diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa deleted file mode 100644 index cb819aad0bc..00000000000 --- a/databases/freetds/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2005/10/09 12:58:59 jdolecek Exp $ - ---- Makefile.in.orig 2005-03-30 02:51:55.000000000 +0200 -+++ Makefile.in 2005-10-09 14:20:14.000000000 +0200 -@@ -576,13 +576,6 @@ - - - install-data-local: -- $(mkinstalldirs) $(ETC) -- if test ! -f $(ETC)/freetds.conf; then \ -- $(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \ -- fi -- if test ! -f $(ETC)/locales.conf; then \ -- $(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \ -- fi - - # do not uninstall configuration files (they may have been changed) - @DISTCHECK_BUILD_TRUE@uninstall-local: diff --git a/databases/freetds/patches/patch-ab b/databases/freetds/patches/patch-ab deleted file mode 100644 index 18577131fd5..00000000000 --- a/databases/freetds/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/06/11 13:24:09 wiz Exp $ - ---- src/pool/Makefile.in.orig Wed Jun 11 14:41:58 2003 -+++ src/pool/Makefile.in -@@ -450,10 +450,6 @@ uninstall-am: uninstall-binPROGRAMS unin - - - install-data-local: -- $(mkinstalldirs) $(ETC) -- if test ! -f $(ETC)/pool.conf; then \ -- $(INSTALL_DATA) $(srcdir)/pool.conf $(ETC)/pool.conf; \ -- fi - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: |