dfports/devel/imake-6 6.7.0_2 -> 6.8.1

Hiroki Sato hrs at allbsd.org
Tue Dec 28 01:24:29 PST 2004


Hi,

 Here is a patch to update dfports/devel/imake-6 from 6.7.0_2 to 6.8.1.

Index: Makefile
===================================================================
RCS file: /cvs/dfports/devel/imake-6/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- Makefile	16 Aug 2004 11:49:48 -0000	1.1
+++ Makefile	28 Dec 2004 04:39:00 -0000
@@ -7,14 +7,12 @@
 #
 
 PORTNAME=	imake
-PORTVERSION=	6.7.0
-PORTREVISION=	2
+PORTVERSION=	6.8.1
 CATEGORIES=	devel
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG} \
-MASTER_SITE_SUBDIR=	R6.7/tars
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src3.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/tars
+DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
+		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11 at xxxxxxxxxxx
 COMMENT=	Imake and other utilities from X.Org
@@ -58,9 +56,6 @@
 		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/cf/FreeBSD.cf
 
-post-install:
-	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
-
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=		is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
 .endif
Index: distinfo
===================================================================
RCS file: /cvs/dfports/devel/imake-6/distinfo,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 distinfo
--- distinfo	16 Aug 2004 11:49:48 -0000	1.1
+++ distinfo	28 Dec 2004 04:25:30 -0000
@@ -1,6 +1,4 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
-MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
-SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
-MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
-SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
Index: pkg-plist
===================================================================
RCS file: /cvs/dfports/devel/imake-6/pkg-plist,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-plist
--- pkg-plist	16 Aug 2004 11:49:48 -0000	1.1
+++ pkg-plist	28 Dec 2004 04:39:48 -0000
@@ -122,19 +122,3 @@
 lib/X11/config/xorg.cf
 lib/X11/config/xorg.tmpl
 lib/X11/config/xorgsite.def
-lib/X11/config/xttMod.tmpl
-lib/X11/doc/html/ccmakedep.1.html
-lib/X11/doc/html/cleanlinks.1.html
-lib/X11/doc/html/gccmakedep.1.html
-lib/X11/doc/html/imake.1.html
-lib/X11/doc/html/lndir.1.html
-lib/X11/doc/html/makedepend.1.html
-lib/X11/doc/html/makeg.1.html
-lib/X11/doc/html/makestrs.1.html
-lib/X11/doc/html/mergelib.1.html
-lib/X11/doc/html/mkdirhier.1.html
-lib/X11/doc/html/mkhtmlindex.1.html
-lib/X11/doc/html/pswrap.1.html
-lib/X11/doc/html/revpath.1.html
-lib/X11/doc/html/rman.1.html
-lib/X11/doc/html/xmkmf.1.html
Index: files/patch-FreeBSD.cf
===================================================================
RCS file: /cvs/dfports/devel/imake-6/files/patch-FreeBSD.cf,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-FreeBSD.cf
--- files/patch-FreeBSD.cf	16 Aug 2004 11:49:48 -0000	1.1
+++ files/patch-FreeBSD.cf	28 Dec 2004 04:27:19 -0000
@@ -1,46 +1,31 @@
---- cf/FreeBSD.cf.orig	Fri Apr  2 13:47:10 2004
-+++ cf/FreeBSD.cf	Fri Jun 18 19:26:35 2004
-@@ -109,32 +109,20 @@
- # endif
- # define HasPosixThreads	YES
- # define ThreadedX		YES
--# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
--/*
-- * FreeBSD has tread-safe api but no getpwnam_r yet.
-- */
-+# define SystemMTDefines	%%PTHREAD_CFLAGS%%
- # define HasThreadSafeAPI	YES
- # if OSRelVersion < 501000
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
- # else
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API
+--- cf/FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
++++ cf/FreeBSD.cf	Fri Sep 10 19:52:31 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid		YES
+ #define HasPoll			YES
+ #endif
++#define BuildHtmlManPages	NO
+ 
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs		YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ #  define NeedUIThrStubs	YES
  # endif
--# if HasLibPthread
+-# if (OSRelVersion >= 502102)
 -#  define ThreadsLibraries	-lpthread
-+# define ThreadsLibraries	%%PTHREAD_LIBS%%
-+# if OSRelVersion >= 500043
-+#  define BuildThreadStubLibrary  NO
-+#  define NeedUIThrStubs          NO
- # else
--#  if OSRelVersion >= 500043
--#   define BuildThreadStubLibrary  NO
--#   define NeedUIThrStubs          NO
--#  else
--#   define BuildThreadStubLibrary  YES
--#   define NeedUIThrStubs          YES
--#  endif
--#  if (OSRelVersion >= 500016)
--#   define ThreadsLibraries	-lc_r
--#   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
--#  else
--#   define ThreadsLibraries	-pthread
--#  endif
-+#  define BuildThreadStubLibrary  YES
-+#  define NeedUIThrStubs          YES
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
-@@ -359,7 +347,7 @@
+-# elif (OSRelVersion >= 500016)
+-#  define ThreadsLibraries	-lc_r
+-# else
+-#  define ThreadsLibraries	-pthread
+-# endif
+-# define SystemMTDefines	-D_THREAD_SAFE
++# define ThreadsLibraries	-lpthread
++# define SystemMTDefines	
+ #endif
+ 
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -338,7 +333,7 @@
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
  #  if UseElfFormat
@@ -49,7 +34,7 @@
  #  else
  #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
  #  endif
-@@ -455,14 +443,14 @@
+@@ -466,14 +461,14 @@
  /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
  #ifndef DefaultGcc2i386Opt
  #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
Index: files/patch-Imake.tmpl
===================================================================
RCS file: /cvs/dfports/devel/imake-6/files/patch-Imake.tmpl,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-Imake.tmpl
--- files/patch-Imake.tmpl	16 Aug 2004 11:49:48 -0000	1.1
+++ files/patch-Imake.tmpl	28 Dec 2004 04:27:19 -0000
@@ -1,6 +1,6 @@
---- cf/Imake.tmpl.orig	Fri Apr  2 13:47:10 2004
-+++ cf/Imake.tmpl	Thu Jul 22 22:51:21 2004
-@@ -1776,7 +1776,7 @@
+--- cf/Imake.tmpl.orig	Tue Jul 27 20:24:29 2004
++++ cf/Imake.tmpl	Fri Sep 10 18:45:12 2004
+@@ -1798,7 +1798,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
@@ -9,13 +9,11 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -2015,8 +2015,8 @@
-  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
+@@ -2038,7 +2038,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
--       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib $(INSTALLED_LIBS)
Index: files/patch-cf-Imakefile
===================================================================
RCS file: /cvs/dfports/devel/imake-6/files/patch-cf-Imakefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-cf-Imakefile
--- files/patch-cf-Imakefile	16 Aug 2004 11:49:48 -0000	1.1
+++ files/patch-cf-Imakefile	28 Dec 2004 04:32:39 -0000
@@ -1,14 +1,6 @@
---- cf/Imakefile.orig	2004-04-02 21:47:10.000000000 +0000
-+++ cf/Imakefile	2004-08-09 10:01:26.000000000 +0000
-@@ -79,12 +79,14 @@
- sv3Lib.tmpl \
- sv4Lib.tmpl \
- xf86.tmpl \
--xorg.tmpl
-+xorg.tmpl \
-+xttMod.tmpl
- 
- CFFILES = \
+--- cf/Imakefile.orig	2004-08-10 07:37:21.000000000 +0900
++++ cf/Imakefile	2004-12-28 13:32:05.000000000 +0900
+@@ -90,6 +90,7 @@
  Imake.cf \
  Amoeba.cf \
  DGUX.cf \
Attachment:
pgp00014.pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pgp00014.pgp
Type: application/octet-stream
Size: 187 bytes
Desc: "Description: PGP signature"
URL: <http://lists.dragonflybsd.org/pipermail/submit/attachments/20041228/8ebea136/attachment-0013.obj>


More information about the Submit mailing list