Adapt this package to NetBSD.

6 files changed, 64 insertions, 55 deletions

diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index da5b93e176f..89517a2a216 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,25 +1,19 @@
-# New ports collection makefile for:    xview-lib
-# Version required:     3.2p1-X11R6
-# Date created:         22 November 1994
-# Whom:                 ljo
-#
-# $Id: Makefile,v 1.1.1.1 1998/07/03 21:02:03 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/07/03 22:58:34 tron Exp $
+# $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
-DISTNAME=	xview-lib
+DISTNAME=	xview3.2p1-X11R6
 PKGNAME=	xview-lib-3.2.1
 CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-DEPENDS=        ${PORTSDIR}/x11/xview-config
+MAINTAINER=	packages@netbsd.org
 
-WRKSRC=      	${PORTSDIR}/x11/xview-config/work/xview3.2p1-X11R6
-USE_IMAKE=	yes
-NO_WRKDIR=      yes
+DEPENDS=        xview-config-3.2.1:../../x11/xview-config
 
-do-fetch:
-do-extract:	# don't use NO_EXTRACT, dependency won't work
+USE_IMAKE=	yes
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include <../../mk/bsd.pkg.mk>
diff --git a/x11/xview-lib/files/md5 b/x11/xview-lib/files/md5
new file mode 100644
index 00000000000..e64991845dc
--- /dev/null
+++ b/x11/xview-lib/files/md5
@@ -0,0 +1 @@
+MD5 (xview3.2p1-X11R6.tar.gz) = 9d3049c6e83114148a9f51d361272816
diff --git a/x11/xview-lib/patches/patch-ab b/x11/xview-lib/patches/patch-ab
index 0e52552d079..cf877e08fcf 100644
--- a/x11/xview-lib/patches/patch-ab
+++ b/x11/xview-lib/patches/patch-ab
@@ -6,7 +6,7 @@
   #include <xview_private/nint.h>
   #include <xview_private/ndis.h>	/* For ndis_dispatch */
   #ifndef SVR4
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #include <syscall.h>
 + #else
 + #include <sys/syscall.h>
@@ -22,7 +22,7 @@
    */
   
   #ifndef SVR4
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #include <syscall.h>
 + #else
 + #include <sys/syscall.h>
@@ -38,7 +38,7 @@
    */
   
   #ifndef SVR4
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #include <syscall.h>
 + #else
 + #include <sys/syscall.h>
@@ -54,7 +54,7 @@
    */
   
   #ifndef SVR4
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #include <syscall.h>
 + #else
 + #include <sys/syscall.h>
diff --git a/x11/xview-lib/patches/patch-ad b/x11/xview-lib/patches/patch-ad
index 9d7ec6328dc..962f6c309d4 100644
--- a/x11/xview-lib/patches/patch-ad
+++ b/x11/xview-lib/patches/patch-ad
@@ -291,7 +291,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c ./lib/lib
   #include <xview_private/flist_impl.h>
   #include <xview_private/portable.h>
   
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__NetBSD__)
 + #include <regex.h>
 + #endif
   
@@ -313,7 +313,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c ./lib/lib
       if (status == DESTROY_CLEANUP) {
   	xv_free_ref( private->directory );
   	xv_free_ref( private->regex_pattern );
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   	xv_free_ref( private->regex_compile );
 + #else
 + 	xv_free_regex_t( (regex_t *)private->regex_compile );
@@ -341,7 +341,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c ./lib/lib
   static int 	step();
   #endif /* SVR4 */
   
-! #ifndef __FreeBSD__
+! #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #include <regexp.h>
 + #endif
   
@@ -350,7 +350,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c ./lib/lib
   flist_compile_regex( private )
        File_list_private *private;
   {
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
       char compile_buf[MAXPATHLEN+1];
       char *end_ptr;
       size_t num_bytes;
@@ -380,7 +380,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c ./lib/lib
        char *s;
        File_list_private *private;
   {
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
       return step(s, private->regex_compile);
 + #else
 +     return !regexec((regex_t *)private->regex_compile, s, 0, NULL, 0);
@@ -648,7 +648,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/file_strms.c ./lib/libxv
   
   #define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   static struct xv_file_input_stream_data {
 + #else
 + struct xv_file_input_stream_data {
@@ -662,7 +662,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/file_strms.c ./lib/libxv
   
   #define GetFOSData struct xv_file_output_stream_data *data = (struct xv_file_output_stream_data*) out->client_data
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   static struct xv_file_output_stream_data {
 + #else
 + struct xv_file_output_stream_data {
@@ -679,7 +679,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/othr_strms.c ./lib/libxv
   
   #define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   static struct xv_filter_comments_stream_data {
 + #else
 + struct xv_filter_comments_stream_data {
@@ -696,7 +696,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/str_strms.c ./lib/libxvi
   
   #define GetSISData struct string_input_stream_data	*data = (struct string_input_stream_data*) in->client_data
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   static struct string_input_stream_data {
 + #else
 + struct string_input_stream_data {
@@ -710,7 +710,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/str_strms.c ./lib/libxvi
   
   #define GetSOSData struct string_output_stream_data *data = (struct string_output_stream_data*) out->client_data
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   static struct string_output_stream_data {
 + #else
 + struct string_output_stream_data {
@@ -1192,7 +1192,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfyclient.c ./lib/libxview
   #include <xview_private/ntfy.h>
   #include <xview_private/ndis.h>	/* For ndis_default_prioritizer */
   #include <xview_private/ndet.h>	
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #include <search.h>
 + #endif
   #include <xview_private/portable.h>
@@ -1204,7 +1204,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfyclient.c ./lib/libxview
       if (*client_latest && (*client_latest)->nclient == nclient)
   	return (*client_latest);
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
       if(( client_list == ndet_clients ) && ndet_clients ) {
          dummy_client.nclient = nclient;
          /* Find client */
@@ -1233,7 +1233,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfyclient.c ./lib/libxview
       register NTFY_CLIENT *client;
       static NTFY_CLIENT *new_client;
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
       if( client_list == &ndet_clients ) {
           if( new_client  == NTFY_CLIENT_NULL ) {
               if ((new_client = ntfy_alloc_client()) == NTFY_CLIENT_NULL)
@@ -1262,7 +1262,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfyclient.c ./lib/libxview
   	ntfy_remove_condition(client, condition, who);
       }
       /* Remove & free client from client_list */
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
       if( client_list == &ndet_clients )
           tdelete( client, ndet_root, ndet_compar );
 + #endif
@@ -1797,7 +1797,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_again.c ./lib/libxview/
    * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
    * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
    */
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
   #ifndef SVR4
   
   /* VARARGS2 */
@@ -1841,7 +1841,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_again.c ./lib/libxview/
    */
   /* VARARGS2 */
   
-+ #ifndef __FreeBSD__
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__)
 + 
   static int
   #ifdef ANSI_FUNC_PROTO
@@ -1930,7 +1930,7 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_e_menu.c ./lib/libxview
   	            goto found;
   	}
   
-! #ifdef __FreeBSD__
+! #if defined(__FreeBSD__) || defined(__NetBSD__)
   	/* Gee, still?... We will try the old fashioned way */
           (void) sprintf(tmp, "%s/lib/.%s",
   		       filename, EXTRASMENU);
diff --git a/x11/xview-lib/patches/patch-ae b/x11/xview-lib/patches/patch-ae
index 812a9d8525b..b8bae9453ee 100644
--- a/x11/xview-lib/patches/patch-ae
+++ b/x11/xview-lib/patches/patch-ae
@@ -119,7 +119,7 @@
    * have more time.
    */
   
-! #if defined(i386) && !defined (__FreeBSD__)
+! #if defined(i386) && !defined (__FreeBSD__) && !defined(__NetBSD__)
   static void
   ttysw_arrow_keys_to_string(xv_id, str)
       unsigned        xv_id;
diff --git a/x11/xview-lib/pkg/PLIST b/x11/xview-lib/pkg/PLIST
index 2a1995289c9..5b2c0967353 100644
--- a/x11/xview-lib/pkg/PLIST
+++ b/x11/xview-lib/pkg/PLIST
@@ -1,23 +1,8 @@
+@comment $NetBSD: PLIST,v 1.2 1998/07/03 22:58:35 tron Exp $
 bin/xgettext
 bin/msgfmt
-lib/libolgx.so.3.2
-lib/libxview.so.3.2
-lib/libolgx.so
-lib/libxview.so
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
-lib/.text_extras_menu
-lib/.textswrc
-lib/.ttyswrc
-lib/text_extras_menu
-lib/textswrc
-lib/ttyswrc
-lib/help/textsw.info
-lib/help/ttysw.info
-lib/help/xview.info
-man/man1/msgfmt.1.gz
-man/man1/xgettext.1.gz
-man/man1/xview.1.gz
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true
 include/bitmaps/1x1
 include/bitmaps/2x2
 include/bitmaps/black
@@ -284,5 +269,34 @@ include/xview_private/xv_color.h
 include/xview_private/xv_debug.h
 include/xview_private/xv_list.h
 include/xview_private/xv_path_util.h
+@dirrm include/xview_private
+@dirrm include/xview
+@dirrm include/pixrect
+@dirrm include/olgx_private
+@dirrm include/olgx
+@dirrm include/images
+@dirrm include/bitmaps
 lib/libolgx.a
+lib/libolgx.so.3.2
+lib/libolgx.so
 lib/libxview.a
+lib/libxview.sa.3.2
+lib/libxview.so.3.2
+lib/libxview.so
+lib/.text_extras_menu
+lib/.textswrc
+lib/.ttyswrc
+lib/text_extras_menu
+lib/textswrc
+lib/ttyswrc
+lib/help/textsw.info
+lib/help/ttysw.info
+lib/help/xview.info
+lib/help/clock.info
+lib/help/olwm.info
+lib/help/props.info
+lib/help/textedit.info
+@dirrm lib/help
+man/cat1/msgfmt.0
+man/cat1/xgettext.0
+man/cat1/xview.0