- add name to MAINTAINER

- add proper DEINSTALL/INSTALL scripts
- use new framework for PLISTs
- add @comment with RCS id to PLIST
- better DESCR and add HOMEPAGE

graphics/gii/Makefile

@@ -1,28 +1,30 @@
-# $OpenBSD: Makefile,v 1.12 2000/06/11 08:51:10 fgsch Exp $
+# $OpenBSD: Makefile,v 1.13 2000/09/23 23:55:52 brad Exp $
 
-DISTNAME=       libgii-0.6
-CATEGORIES=     graphics
-NEED_VERSION=	1.301
+DISTNAME=	libgii-0.6
+CATEGORIES=	graphics
+NEED_VERSION=	1.330
+MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_2.1/
 
-MAINTAINER=     [email protected]
+MAINTAINER=	Todd Fries <[email protected]>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_2.1/
-
+USE_X11=	Yes
 USE_GMAKE=	Yes
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static --enable-mutexes="int"
 
-DOCDIR=		${PREFIX}/share/doc/gii
+DOCS=	README
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/libgii.conf ${DOCDIR}/libgii.conf.example
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gii
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gii
+	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gii
+	${INSTALL_DATA} ${WRKSRC}/libgii.conf
+		${PREFIX}/share/examples/gii/libgii.conf.example
 
 .include <bsd.port.mk>

graphics/gii/pkg/DEINSTALL

@@ -0,0 +1,25 @@
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.1 2000/09/23 23:55:52 brad Exp $
+#
+# gii de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=${SYSCONFDIR}/ggi
+
+if [ -d $CONFIG_DIR ]; then
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| this step as root:"
+    echo "|"
+    echo "|           rm -rf $CONFIG_DIR"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+fi
+
+exit 0

graphics/gii/pkg/DESCR

@@ -1,6 +1,3 @@
-LibGII README
-=============
-
 LibGII (General Input Interface) is intended to be to input what our LibGGI
 (General Graphics Interface) library is to graphics.
 
@@ -15,33 +12,4 @@ the mhub utility found in the demos directory. mhub is a mouse event repeater
 and converter. See mhub(1) and the files doc/env.txt and doc/input.txt for
 more info.
 
-
-How to install and use
-======================
-
-See the files INSTALL and INSTALL.autoconf for installation instructions.
-
-Demos are found in the programs/demos sub directory.  They are built
-automatically.
-
-
-The GGI mailing list
-====================
-
-To subscribe to the GGI mailing list, send a message with the word
-"subscribe" in the Subject: field to [email protected]
-To unsubscribe from the GGI mailing list, send a message with the word
-"unsubscribe" in the Subject: field to [email protected]
-
-This is a high volume mailing list with well over 1000 messages a month!
-So be prepared.
-
-
-GGI resources
-=============
-
-Web site: http://www.ggi-project.org/
-FTP site: ftp://ftp.ggi-project.org/pub/ggi
-
-XGGI home: http://www.stacken.kth.se/~mackan/ggi/xggi/
-(XGGI is an X server which runs on LibGGI)
+WWW: ${HOMEPAGE}

graphics/gii/pkg/INSTALL

@@ -0,0 +1,69 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2000/09/23 23:55:52 brad Exp $
+#
+# Pre/post-installation setup of gii
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=${SYSCONFDIR}/ggi
+CONFIG_FILE=$CONFIG_DIR/libgii.conf
+SAMPLE_CONFIG_FILE=$PREFIX/share/examples/gii/libgii.conf.example
+
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| The existing $1 configuration file, $CONFIG_FILE,"
+    echo "| has NOT been changed.  You may want to compare it to the"
+    echo "| current sample file, $SAMPLE_CONFIG_FILE,"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+do_install()
+{
+    install -d -o root -g wheel -m 755 $CONFIG_DIR
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, $CONFIG_FILE,"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs"
+    echo "+---------------"
+    echo
+
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ ! -d $CONFIG_DIR ]; then
+	    do_install $1
+	elif [ ! -f $CONFIG_FILE ]; then
+	    do_install $1
+	else
+	    do_notice $1
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0

graphics/gii/pkg/PFRAG.shared

@@ -0,0 +1,14 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/23 23:55:53 brad Exp $
+lib/ggi/filter/mouse.so
+lib/ggi/filter/save.so
+lib/ggi/input/file.so
+lib/ggi/input/linux_mouse.so
+lib/ggi/input/mouse.so
+lib/ggi/input/null.so
+lib/ggi/input/spaceorb.so
+lib/ggi/input/stdin.so
+lib/ggi/input/x.so
+lib/ggi/input/xwin.so
+lib/libgg.so.0.6
+lib/libgii.so.0.6
+DYNLIBDIR(%B)

graphics/gii/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2000/06/11 08:51:10 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.7 2000/09/23 23:55:53 brad Exp $
 bin/mhub
 bin/xsendbut
 include/ggi/errors.h
@@ -15,41 +15,29 @@ include/ggi/keyboard.h
 include/ggi/system.h
 lib/ggi/filter/mouse.a
 lib/ggi/filter/mouse.la
-lib/ggi/filter/mouse.so
 lib/ggi/filter/save.a
 lib/ggi/filter/save.la
-lib/ggi/filter/save.so
 lib/ggi/input/file.a
 lib/ggi/input/file.la
-lib/ggi/input/file.so
 lib/ggi/input/linux_mouse.a
 lib/ggi/input/linux_mouse.la
-lib/ggi/input/linux_mouse.so
 lib/ggi/input/mouse.a
 lib/ggi/input/mouse.la
-lib/ggi/input/mouse.so
 lib/ggi/input/null.a
 lib/ggi/input/null.la
-lib/ggi/input/null.so
 lib/ggi/input/spaceorb.a
 lib/ggi/input/spaceorb.la
-lib/ggi/input/spaceorb.so
 lib/ggi/input/stdin.a
 lib/ggi/input/stdin.la
-lib/ggi/input/stdin.so
 lib/ggi/input/x.a
 lib/ggi/input/x.la
-lib/ggi/input/x.so
 lib/ggi/input/xwin.a
 lib/ggi/input/xwin.la
-lib/ggi/input/xwin.so
 lib/libgg.a
 lib/libgg.la
-lib/libgg.so.0.6
 lib/libgii.a
 lib/libgii.la
-lib/libgii.so.0.6
-@exec /sbin/ldconfig -m %B
+%%SHARED%%
 man/man1/mhub.1
 man/man3/giiAddEventMask.3gii
 man/man3/giiClose.3gii
@@ -65,17 +53,12 @@ man/man3/giiPanic.3gii
 man/man3/giiRemoveEventMask.3gii
 man/man3/giiSetEventMask.3gii
 share/doc/gii/README
-share/doc/gii/libgii.conf.example
+share/examples/gii/libgii.conf.example
 @dirrm share/doc/gii
+@dirrm share/examples/gii
 @dirrm lib/ggi/input
 @dirrm lib/ggi/filter
 @dirrm lib/ggi
 @dirrm include/ggi/internal
 @dirrm include/ggi/input
 @dirrm include/ggi
-@unexec echo "***"
-@unexec echo "*** gii configuation files stored in /etc/ggi have not been"
-@unexec echo "*** removed.  You may wish to remove them manually."
-@unexec echo "***"
-@exec [ -d /etc/ggi ] || mkdir -p /etc/ggi
-@exec [ -f /etc/ggi/libgii.conf ] || cp share/doc/gii/libgii.conf.example /etc/ggi/libgii.conf