* Use variables instead of hardcoded prefixes.

* Take care to set a sane PATH.
* Add set -e
* Copy example files into ${PREFIX}/share/examples/PORTNAME.
* Replace PKGNAME with P_NAME in INSTALL/DEINSTALL scripts, unclear
  since it already exists in the Makefile with a different value.
* Change output of INSTALL/DEINSTALL to be more like other scripts
  found in the tree(suggested by heko@).
* Add missing gdbm dependency.

Submitted by maintainer Nils Nordman <nino@nforced.com>.
This commit is contained in:
naddy 2001-09-18 22:33:02 +00:00
parent b9b92e671f
commit c914b9cb77
4 changed files with 46 additions and 39 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2001/09/14 14:41:30 todd Exp $
# $OpenBSD: Makefile,v 1.3 2001/09/18 22:33:02 naddy Exp $
COMMENT= "GNOME icq client"
V= 0.96.1
@ -11,8 +11,8 @@ MAINTAINER= Nils Nordman <nino@nforced.com>
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnomeicu
LIB_DEPENDS= panel_applet::x11/gnome/core
LIB_DEPENDS= panel_applet::x11/gnome/core \
gdbm.::databases/gdbm
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -26,6 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv"
post-install:
@cp -r ${PREFIX}/../../etc/* ${PREFIX}/share/gnomeicu/
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnomeicu; \
cp -rp ${PREFIX}/../../etc/* ${PREFIX}/share/examples/gnomeicu/
.include <bsd.port.mk>

View File

@ -1,24 +1,27 @@
#!/bin/sh
#
# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/09/13 20:47:16 todd Exp $
# $OpenBSD: DEINSTALL,v 1.2 2001/09/18 22:33:02 naddy Exp $
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
echo
echo "*=================[ $1"
echo "* To really remove $1 from your system you should also"
echo "* remove the configuration files from the /etc directory."
echo "* If you are planning on installing $1 again in the future"
echo "* you can leave it as it is."
echo "*"
echo "* FYI, the following configuration files belongs to this package:"
echo "*"
echo "+--------------- $1"
echo "| To really remove $1 from your system you should also"
echo "| remove the configuration files from the ${SYSCONFDIR} directory."
echo "| If you are planning on installing $1 again in the future"
echo "| you can leave it as it is."
echo "|"
echo "| FYI, the following configuration files belongs to this package:"
echo "|"
for f in \
CORBA/servers/GnomeICU.gnorba \
sound/events/GnomeICU.soundlist
do
echo "* /etc/$f"
echo "| ${SYSCONFDIR}/$f"
done
echo "*================= $1 ]"
echo "+--------------- $1"
echo
exit 0

View File

@ -1,16 +1,18 @@
#!/bin/sh
#
# $OpenBSD: INSTALL,v 1.1.1.1 2001/09/13 20:47:16 todd Exp $
# $OpenBSD: INSTALL,v 1.2 2001/09/18 22:33:02 naddy Exp $
set -e
PREFIX=${PKG_PREFIX:-/usr/local}
PKGNAME=gnomeicu
DEST_PFX=/etc
SOURCE_PFX=${PREFIX}/share/${PKGNAME}
PATH=/bin:/usr/bin:/sbin:/usr/sbin
P_NAME=gnomeicu
DEST_PFX=${SYSCONFDIR}
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
do_post() {
echo
echo "*=================[ ${PKGNAME}"
echo "+--------------- ${P_NAME}"
# install or take note of existing config files
for f in \
@ -21,7 +23,7 @@ do_post() {
OLD_CONFS="${OLD_CONFS} $f"
else
if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
echo "* ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
exit 1
fi
NEW_CONFS="${NEW_CONFS} $f"
@ -30,26 +32,26 @@ do_post() {
# print status report
if [ -n "${NEW_CONFS}" ]; then
echo "* The following NEW configuration files have been installed:"
echo "*"
echo "| The following NEW configuration files have been installed:"
echo "|"
for f in ${NEW_CONFS}; do
echo "* ${DEST_PFX}/$f"
echo "| ${DEST_PFX}/$f"
done
fi
if [ -n "${OLD_CONFS}" ]; then
if [ -n "${NEW_CONFS}" ]; then
echo "*"
echo "|"
fi
echo "* The following OLD configuration files was found and have NOT been overwritten:"
echo "* You should however manually compare it to it's equivalent in ${SOURCE_PFX}"
echo "* and update your configuration if needed."
echo "*"
echo "| The following OLD configuration files was found and have NOT been overwritten:"
echo "| You should however manually compare it to it's equivalent in ${SOURCE_PFX}"
echo "| and update your configuration if needed."
echo "|"
for f in ${OLD_CONFS}; do
echo "* ${DEST_PFX}/$f"
echo "| ${DEST_PFX}/$f"
done
fi
echo "*================= ${PKGNAME} ]"
echo "+--------------- ${P_NAME}"
echo
}

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 20:47:16 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/09/18 22:33:02 naddy Exp $
bin/gnomeicu
bin/gnomeicu-client
share/applets/Network/GnomeICU.desktop
share/examples/gnomeicu/sound/events/GnomeICU.soundlist
share/examples/gnomeicu/CORBA/servers/GnomeICU.gnorba
share/gnome/apps/Internet/GnomeICU.desktop
share/gnome/help/gnomeicu/C/topic.dat
share/gnomeicu/icons/Default/gnomeicu-animation.png
@ -83,8 +85,6 @@ share/gnomeicu/icons/reDubbed/gnomeicu-online.png
share/gnomeicu/icons/reDubbed/gnomeicu-rename.png
share/gnomeicu/icons/reDubbed/gnomeicu-still.png
share/gnomeicu/icons/reDubbed/gnomeicu-url.png
share/gnomeicu/sound/events/GnomeICU.soundlist
share/gnomeicu/CORBA/servers/GnomeICU.gnorba
share/pixmaps/gnome-gnomeicu.xpm
share/sounds/gnomeicu/message.wav
@dirrm share/sounds/gnomeicu
@ -93,10 +93,11 @@ share/sounds/gnomeicu/message.wav
@dirrm share/gnomeicu/icons/Eyeballs
@dirrm share/gnomeicu/icons/Default
@dirrm share/gnomeicu/icons
@dirrm share/gnomeicu/sound/events
@dirrm share/gnomeicu/sound/
@dirrm share/gnomeicu/CORBA/servers
@dirrm share/gnomeicu/CORBA
@dirrm share/gnomeicu
@dirrm share/gnome/help/gnomeicu/C
@dirrm share/gnome/help/gnomeicu
@dirrm share/gnome/help/gnomeicu
@dirrm share/examples/gnomeicu/sound/events
@dirrm share/examples/gnomeicu/sound
@dirrm share/examples/gnomeicu/CORBA/servers
@dirrm share/examples/gnomeicu/CORBA
@dirrm share/examples/gnomeicu