summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-09-25 12:49:58 +0000
committerjoerg <joerg@pkgsrc.org>2006-09-25 12:49:58 +0000
commit8227968271a4088fb51fbc0c41f8816cd03c4168 (patch)
tree5253c73fa628bf5ce17751f3ce171d0b5e02ce93
parent345a613795e21b189bd5914d2a2d72b9f766ec2c (diff)
downloadpkgsrc-8227968271a4088fb51fbc0c41f8816cd03c4168.tar.gz
Always use INSTALLMINORREV, eliminiating the special handling in
FreeBSD. Bump revision. Tested by Peter Schuller.
-rw-r--r--x11/xorg-imake/Makefile4
-rw-r--r--x11/xorg-imake/patches/patch-ak13
2 files changed, 10 insertions, 7 deletions
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 9ea25277d1e..5c135fc000c 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/07/31 16:39:42 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/09/25 12:49:58 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
diff --git a/x11/xorg-imake/patches/patch-ak b/x11/xorg-imake/patches/patch-ak
index 1704195d2e0..37d7e3e8ff4 100644
--- a/x11/xorg-imake/patches/patch-ak
+++ b/x11/xorg-imake/patches/patch-ak
@@ -1,13 +1,16 @@
-$NetBSD: patch-ak,v 1.3 2006/01/19 00:30:55 joerg Exp $
+$NetBSD: patch-ak,v 1.4 2006/09/25 12:49:58 joerg Exp $
--- config/cf/bsdLib.rules.orig 2005-06-01 18:09:09.000000000 +0200
+++ config/cf/bsdLib.rules
-@@ -229,7 +229,7 @@ LintLibReferences(varname,libname,libsou
+@@ -229,11 +229,7 @@ LintLibReferences(varname,libname,libsou
* InstallSharedLibrary - generate rules to install the shared library.
* NOTE: file must be executable, hence "INSTBINFLAGS"
*/
-#ifndef FreeBSDArchitecture
-+#if !defined(FreeBSDArchitecture) || defined(DragonFlyArchitecture)
INSTALLMINORREV = true
- #else
- INSTALLMINORREV = false
+-#else
+-INSTALLMINORREV = false
+-#endif
+
+ #ifndef InstallSharedLibrary
+ #define InstallSharedLibrary(libname,rev,dest) @@\