diff options
| author | jmmv <jmmv@pkgsrc.org> | 2002-12-22 21:33:14 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2002-12-22 21:33:14 +0000 |
| commit | c5990d137efe5c7921b52c26c6d49cf5bb8bff4a (patch) | |
| tree | 4a539914654bbfb051cfb6b36460b765b1f07cd2 /wm/ion/patches | |
| parent | 9fb7624b7b9b774308623192593f2d805c69b336 (diff) | |
| download | pkgsrc-c5990d137efe5c7921b52c26c6d49cf5bb8bff4a.tar.gz | |
Make this package install its configuration files under the examples tree
and use bsd.pkg.install.mk to copy them to PKG_SYSCONFDIR during the
installation. Bump PKGREVISION to 1.
Diffstat (limited to 'wm/ion/patches')
| -rw-r--r-- | wm/ion/patches/patch-ab | 15 | ||||
| -rw-r--r-- | wm/ion/patches/patch-ad | 13 |
2 files changed, 21 insertions, 7 deletions
diff --git a/wm/ion/patches/patch-ab b/wm/ion/patches/patch-ab index 95a4b611f9e..765ae2f08fa 100644 --- a/wm/ion/patches/patch-ab +++ b/wm/ion/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2002/12/22 21:33:15 jmmv Exp $ ---- system.mk.orig Mon Mar 5 11:16:01 2001 +--- system.mk.orig Mon Mar 5 17:16:01 2001 +++ system.mk @@ -7,13 +7,13 @@ ## Installation paths @@ -11,14 +11,15 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $ # No need to modify these usually BINDIR=$(PREFIX)/bin - ETCDIR=$(PREFIX)/etc +-ETCDIR=$(PREFIX)/etc ++ETCDIR=$(PREFIX)/share/examples MANDIR=$(PREFIX)/man -DOCDIR=$(PREFIX)/doc +DOCDIR=$(PREFIX)/share/doc # Not used INCDIR=$(PREFIX)/include LIBDIR=$(PREFIX)/lib -@@ -24,14 +24,14 @@ +@@ -24,14 +24,14 @@ LIBDIR=$(PREFIX)/lib ## #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT @@ -35,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -59,7 +59,6 @@ +@@ -59,7 +59,6 @@ X11_DEFINES= ## C compiler ## @@ -43,7 +44,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $ # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary, # they're mainly for development use. So, if they cause trouble (not -@@ -86,8 +85,8 @@ +@@ -86,8 +85,8 @@ WARN= -W -Wimplicit -Wreturn-type -Wswit -Wparentheses -pedantic-errors -Wuninitialized @@ -54,7 +55,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $ ## -@@ -112,9 +111,9 @@ +@@ -112,9 +111,9 @@ RANLIB=ranlib ## # Should work almost everywhere diff --git a/wm/ion/patches/patch-ad b/wm/ion/patches/patch-ad new file mode 100644 index 00000000000..330f20fb41c --- /dev/null +++ b/wm/ion/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2002/12/22 21:33:15 jmmv Exp $ + +--- src/Makefile.orig Wed May 23 23:58:05 2001 ++++ src/Makefile +@@ -10,7 +10,7 @@ include ../system.mk + LIBS += -L../libtu -ltu -lm $(X11_LIBS) -lX11 + #-lefence + INCLUDES += -I../libtu/include $(X11_INCLUDES) +-DEFINES += -DETCDIR=\"$(ETCDIR)\" ++DEFINES += -DETCDIR=\"$(PKG_SYSCONFBASE)\" + + CFLAGS += $(XOPEN_SOURCE) $(MODULE_SUPPORT) + LDFLAGS += $(MODULE_SUPPORT_LDFLAGS) |