For ports that build via imake, stop installing preformatted man
pages and instead install the source pages. This change simply rips out OpenBSD's historical special rules for preformatting man pages and restores imake's defaults. ok espie@ matthieu@ sthen@
This commit is contained in:
naddy
parent
9612b89375
commit
62e764c59d
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2013/03/11 10:50:09 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2013/10/11 20:36:17 naddy Exp $
|
||||
|
||||
PKG_ARCH = *
|
||||
COMMENT = config files for imake
|
||||
@ -7,7 +7,7 @@ DISTNAME = xorg-cf-files-1.0.4
|
||||
PKGNAME = imake-cf-1.0.4
|
||||
MASTER_SITES = http://ftp.x.org/pub/individual/util/
|
||||
|
||||
REVISION = 2
|
||||
REVISION = 3
|
||||
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-OpenBSD_cf,v 1.3 2012/09/23 07:58:50 matthieu Exp $
|
||||
$OpenBSD: patch-OpenBSD_cf,v 1.4 2013/10/11 20:36:18 naddy Exp $
|
||||
--- OpenBSD.cf.orig Fri Oct 16 23:45:42 2009
|
||||
+++ OpenBSD.cf Sun Sep 2 20:30:21 2012
|
||||
+++ OpenBSD.cf Thu Oct 10 17:25:16 2013
|
||||
@@ -26,10 +26,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
|
||||
#define LibDir /usr/local/lib/X11
|
||||
#define UsrLibDir /usr/local/lib
|
||||
@ -41,38 +41,91 @@ $OpenBSD: patch-OpenBSD_cf,v 1.3 2012/09/23 07:58:50 matthieu Exp $
|
||||
#define HasGroff YES
|
||||
|
||||
#ifndef HasCookieMaker
|
||||
@@ -262,6 +277,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
|
||||
@@ -262,77 +277,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
|
||||
*/
|
||||
#define ManSuffix 1
|
||||
#define FileManSuffix 5
|
||||
+
|
||||
+#ifdef Ports
|
||||
+
|
||||
#define ManSourcePath $(MANPATH)/cat
|
||||
-#define ManSourcePath $(MANPATH)/cat
|
||||
|
||||
#define InstallManPageLongBase(file,destdir,dest) @@\
|
||||
@@ -335,6 +353,20 @@ install.man:: @@\
|
||||
); \ @@\
|
||||
done
|
||||
|
||||
+#else /* Ports */
|
||||
+
|
||||
+#define InstallManPageAliasesBase(file,destdir,aliases) @@\
|
||||
-#define InstallManPageLongBase(file,destdir,dest) @@\
|
||||
-all:: file.0 @@\
|
||||
- @@\
|
||||
-file.0:: file.$(MANNEWSUFFIX) @@\
|
||||
- @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\
|
||||
- then \ @@\
|
||||
- cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | \ @@\
|
||||
- $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\
|
||||
- fi @@\
|
||||
- @@\
|
||||
-install.man:: @@\
|
||||
- MakeDir($(DESTDIR)destdir) @@\
|
||||
- -@if [ -f file.0 ]; \ @@\
|
||||
- then \ @@\
|
||||
- $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
|
||||
- fi @@\
|
||||
- @@\
|
||||
-clean:: @@\
|
||||
- RemoveFile(file.0)
|
||||
-
|
||||
-#define InstallManPageLong(file,destdir,dest) @@\
|
||||
-BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
|
||||
- @@\
|
||||
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
|
||||
- @@\
|
||||
-InstallManPageLongBase(file,destdir,dest)
|
||||
-
|
||||
-#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
|
||||
-BuildInstallHtmlManPage(file,dest,suffix) @@\
|
||||
- @@\
|
||||
-CppManTarget(file, $(EXTRAMANDEFS)) @@\
|
||||
- @@\
|
||||
-InstallManPageLongBase(file,destdir,dest)
|
||||
-
|
||||
-#define InstallMultipleMan(list,dest) @@\
|
||||
-install.man:: @@\
|
||||
- MakeDir($(DESTDIR)dest) @@\
|
||||
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
|
||||
- for i in list; do \ @@\
|
||||
- (MNAME=`echo $$i | cut -f1 -d.`; \ @@\
|
||||
- set -x; \ @@\
|
||||
- cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
|
||||
- | $(COL) > $${MNAME}.0; \ @@\
|
||||
- $(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \ @@\
|
||||
- $(DESTDIR)dest/$${MNAME}.0; \ @@\
|
||||
- $(RM) $${MNAME}.0); \ @@\
|
||||
- done
|
||||
-
|
||||
-#define InstallMultipleManSuffix(list,dest,suff) @@\
|
||||
-install.man:: @@\
|
||||
- MakeDir($(DESTDIR)dest) @@\
|
||||
- case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
|
||||
- for i in list; do \ @@\
|
||||
- (set -x; \ @@\
|
||||
- cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
|
||||
- | $(COL) > $$i.0; \ @@\
|
||||
- $(INSTALL) -c $(INSTMANFLAGS) $$i.0 \ @@\
|
||||
- $(DESTDIR)dest/$$i.0; \ @@\
|
||||
- $(RM) $$i.0 ); \ @@\
|
||||
- done
|
||||
-
|
||||
#define InstallManPageAliasesBase(file,destdir,aliases) @@\
|
||||
-install.man:: @@\
|
||||
- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
|
||||
- for i in aliases; do \ @@\
|
||||
+install.man:: @@\
|
||||
+ @SUFFIX=${MANSUFFIX}; \ @@\
|
||||
+ for i in aliases; do \ @@\
|
||||
+ (set -x; \ @@\
|
||||
(set -x; \ @@\
|
||||
- $(RM) $(DESTDIR)destdir/$$i.0;\ @@\
|
||||
- (cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\
|
||||
- ); \ @@\
|
||||
+ $(RM) $(DESTDIR)destdir/$$i.*; \ @@\
|
||||
+ (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\
|
||||
+ $$i.$${SUFFIX})); \ @@\
|
||||
+ done
|
||||
+
|
||||
+#endif /* Ports */
|
||||
+
|
||||
done
|
||||
|
||||
#define InstallManPageAliases(file,destdir,aliases) @@\
|
||||
InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
|
||||
@@\
|
||||
@@ -436,8 +468,6 @@ install:: fonts.alias @@\
|
||||
@@ -436,8 +389,6 @@ install:: fonts.alias @@\
|
||||
#ifdef AMD64Architecture
|
||||
|
||||
# define HasWeakSymbols YES
|
||||
@ -81,7 +134,7 @@ $OpenBSD: patch-OpenBSD_cf,v 1.3 2012/09/23 07:58:50 matthieu Exp $
|
||||
|
||||
# define XorgServer YES
|
||||
|
||||
@@ -666,51 +696,26 @@ install:: fonts.alias @@\
|
||||
@@ -666,51 +617,26 @@ install:: fonts.alias @@\
|
||||
|
||||
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user