kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify XFree86-libs doing the following changes:

Browse source 
o Move manual pages from PLIST.${OPSYS} to PLIST.common
	o Disable compression of manual pages in FreeBSD.
	o Use IMAKE_* vars for the manual pages.
This commit is contained in:
xtraeme 2004-01-31 15:06:24 +00:00
parent 696c516013
commit d8d5356624
7 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
x11/XFree86-libs/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $
# $NetBSD: Makefile,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-libs-${XF_VER}
@ -15,6 +15,7 @@ CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
USE_IMAKE= yes
DEPENDS= imake>=4.3.0:../../x11/imake
.include "../../mk/bsd.prefs.mk"
@ -36,7 +37,7 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \
XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
post-patch:
${SED} -e 's,@MAKESTRS@,${X11PREFIX}/bin/makestrs,g' \
@${SED} -e 's,@MAKESTRS@,${X11PREFIX}/bin/makestrs,g' \
${WRKSRC}/config/cf/Library.tmpl \
> ${WRKSRC}/config/cf/Library.tmpl.tmp && \
${MV} ${WRKSRC}/config/cf/Library.tmpl.tmp \

4
x11/XFree86-libs/PLIST.FreeBSD
View file

@ -1,4 +0,0 @@
@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $
man/man3/Xaw.3.gz
man/man3/Xcursor.3.gz
man/man3/Xrandr.3.gz

5
x11/XFree86-libs/PLIST.Linux
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/01/24 08:47:24 xtraeme Exp $
@comment $NetBSD: PLIST.Linux,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
include/X11/extensions/xf86rush.h
include/X11/extensions/xf86rushstr.h
lib/libI810XvMC.a
@ -33,6 +33,3 @@ lib/libdps.so.1.0
lib/libdpstk.so.1.0
lib/liboldX.so.6.0
lib/libpsres.so.1.0
man/man3/Xaw.3x
man/man3/Xcursor.3x
man/man3/Xrandr.3x

5
x11/XFree86-libs/PLIST.NetBSD
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/01/24 08:47:24 xtraeme Exp $
@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
lib/libGL.so.1.2
lib/libGLU.so.1.3
lib/libICE.so.6.3
@ -29,6 +29,3 @@ lib/libdps.so.1.0
lib/libdpstk.so.1.0
lib/liboldX.so.6.0
lib/libpsres.so.1.0
man/cat3/Xaw.0
man/cat3/Xcursor.0
man/cat3/Xrandr.0

5
x11/XFree86-libs/PLIST.common
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/24 08:47:27 xtraeme Exp $
@comment $NetBSD: PLIST.common,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
bin/xcursor-config
include/DPS/ColorSB.h
include/DPS/ColorSBP.h
@ -617,6 +617,9 @@ lib/libpsres.so.1
lib/libxf86config.a
lib/libxkbfile.a
lib/libxkbui.a
${IMAKE_LIBMAN_DIR}/Xaw.${IMAKE_LIBMAN_SUFFIX}
${IMAKE_LIBMAN_DIR}/Xcursor.${IMAKE_LIBMAN_SUFFIX}
${IMAKE_LIBMAN_DIR}/Xrandr.${IMAKE_LIBMAN_SUFFIX}
@dirrm include/DPS
@dirrm include/GL
@dirrm include/X11/Xcursor

4
x11/XFree86-libs/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $
$NetBSD: distinfo,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b
Size (X430src-1.tgz) = 10993622 bytes
@ -28,7 +28,7 @@ SHA1 (patch-aq) = c229aac69ac0e503c4cac3c7f532cd6b4cbdef39
SHA1 (patch-ar) = 129171c7ce2bfb08a6fef06e8ed77e7031a29eb0
SHA1 (patch-as) = 5bfc792b879c859745b5dd1e71ac3e57ea9a7a37
SHA1 (patch-at) = 89a4bcd4351d7b2967da744619e3912b2efa7138
SHA1 (patch-au) = 47d802003d04c4d64f661104458592f86db81dce
SHA1 (patch-au) = 77568c9cddca68e910e6db8d6d7baa5e495a0fb5
SHA1 (patch-av) = 4c124eaf876e48b9deea2f7a63fd052f4fb11baa
SHA1 (patch-aw) = b9e4c6f04b0f55abd8c589889ba5d3721deaf670
SHA1 (patch-ax) = 65c6a325c5378b18b55915c002be2827c8acab24

49
x11/XFree86-libs/patches/patch-au
View file

@ -1,37 +1,36 @@
$NetBSD: patch-au,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $
$NetBSD: patch-au,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
--- config/cf/FreeBSD.cf.in.orig Tue Jul 22 05:38:50 2003
+++ config/cf/FreeBSD.cf.in Tue Jul 22 05:42:22 2003
@@ -162,14 +162,14 @@
--- config/cf/FreeBSD.cf.in.orig Sat Jan 31 15:05:04 2004
+++ config/cf/FreeBSD.cf.in Sat Jan 31 15:07:28 2004
@@ -161,15 +161,10 @@
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-# define CcCmd $(CLIENTENVSETUP) cc
-# define CplusplusCmd $(CLIENTENVSETUP) c++
+# define CcCmd $(CLIENTENVSETUP) @@PKGSRC_CC@@
+# define CplusplusCmd $(CLIENTENVSETUP) @@PKGSRC_CXX@@
#else
-#else
-# define CcCmd cc
-# define CplusplusCmd c++
+# define CcCmd @@PKGSRC_CC@@
+# define CplusplusCmd @@PKGSRC_CXX@@
#endif
-#endif
+#define CcCmd @@PKGSRC_CC@@
+#define CplusplusCmd @@PKGSRC_CXX@@
-#define CppCmd /usr/bin/cpp
+#define CppCmd @@PKGSRC_CPP@@
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
@@ -177,7 +177,7 @@
@@ -177,7 +172,7 @@
#if defined(UseInstalled)
#define DefaultCCOptions /**/
#else
-#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions
+#define DefaultCCOptions -ansi @@PKGSRC_CFLAGS@@ -Dasm=__asm
+#define DefaultCCOptions -ansi -Dasm=__asm
#endif
#endif
#ifndef ExtraLibraries
@@ -482,17 +482,12 @@
@@ -482,18 +477,9 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif
@ -41,13 +40,23 @@ $NetBSD: patch-au,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $
-#define DefaultGcc2i386Opt -O2
-#endif
-#endif
+#define DefaultGcc2i386Opt
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
#endif
-#endif
+#define DefaultGcc2i386Opt
+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
#ifndef PreIncDir
# define PreIncDir /usr/include
@@ -519,7 +505,7 @@
* Compress manual pages
*/
#ifndef CompressManPages
-# define CompressManPages YES
+# define CompressManPages NO
#endif
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)