summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fonts/t1lib/DEINSTALL26
-rw-r--r--fonts/t1lib/INSTALL36
-rw-r--r--fonts/t1lib/Makefile44
-rw-r--r--fonts/t1lib/PLIST4
4 files changed, 25 insertions, 85 deletions
diff --git a/fonts/t1lib/DEINSTALL b/fonts/t1lib/DEINSTALL
deleted file mode 100644
index c0b3837c1dd..00000000000
--- a/fonts/t1lib/DEINSTALL
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
- ;;
-POST-DEINSTALL)
- CONFDIR=${PKG_PREFIX}/share/t1lib
-
- cat << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may wish to manually
-remove the ${CONFDIR} directory.
-===========================================================================
-EOF
- ;;
-*)
- echo "Unexpected argument: $2"
- exit 1
- ;;
-esac
-exit 0
diff --git a/fonts/t1lib/INSTALL b/fonts/t1lib/INSTALL
deleted file mode 100644
index 2cb265287ed..00000000000
--- a/fonts/t1lib/INSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-PRE-INSTALL)
- ;;
-POST-INSTALL)
- CONFDIR=${PKG_PREFIX}/share/t1lib
-
- echo "Installing configuration files:"
- if [ ! -f ${CONFDIR}/t1lib.config ]
- then
- echo " t1lib.config"
- cp ${PKG_PREFIX}/share/examples/t1lib/t1lib.config.netbsd \
- ${CONFDIR}/t1lib.config
- chmod 644 ${CONFDIR}/t1lib.config
- fi
- if [ ! -f ${CONFDIR}/FontDataBase ]
- then
- echo " FontDataBase"
- cp ${PKG_PREFIX}/share/examples/t1lib/FontDataBase \
- ${CONFDIR}/FontDataBase
- chmod 644 ${CONFDIR}/FontDataBase
- fi
- echo "done."
- ;;
-*)
- echo "Unexpected argument: $2"
- exit 1
- ;;
-esac
-exit 0
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 312d7566d69..1019d463443 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/19 00:51:21 jlam Exp $
#
DISTNAME= t1lib-1.1.1
@@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html
COMMENT= Library for generating bitmaps from Adobe Type 1 fonts
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
USE_GMAKE= # defined
USE_X11BASE= # defined
@@ -20,24 +20,26 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
ALL_TARGET= without_doc
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+DATADIR= ${PREFIX}/share/${PKGBASE}
+
+CONF_FILES= ${EGDIR}/t1lib.config.netbsd ${DATADIR}/t1lib.config
+CONF_FILES+= ${EGDIR}/FontDataBase ${DATADIR}/FontDataBase
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/t1lib
- cd ${WRKSRC}; \
- ${PAX} -rw Fonts ${PREFIX}/share/t1lib; \
- ${CHMOD} go+r ${PREFIX}/share/t1lib/Fonts/enc/IsoLatin2.enc; \
- ${PAX} -rw -s "/doc/t1lib/" doc ${PREFIX}/share/doc
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/t1lib
- cd ${WRKSRC}/examples; \
- ${PAX} -rw FontDataBase t1example1.c t1lib.config \
- ${PREFIX}/share/examples/t1lib
- ${SED} -e 's|@@X11BASE@@|${X11BASE}|g' \
- -e 's|@@LOCALBASE@@|${LOCALBASE}|g' \
- -e 's|@@PREFIX@@|${PREFIX}|g' \
- < ${FILESDIR}/t1lib.config.netbsd \
- > ${PREFIX}/share/examples/t1lib/t1lib.config.netbsd
-
- PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/x11.buildlink.mk"
+ ${INSTALL_DATA_DIR} ${DATADIR}
+ cd ${WRKSRC}; \
+ ${PAX} -rw Fonts ${DATADIR}; \
+ ${CHMOD} go+r ${DATADIR}/Fonts/enc/IsoLatin2.enc; \
+ ${PAX} -rw -s "/doc/t1lib/" doc ${PREFIX}/share/doc
+
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ cd ${WRKSRC}/examples; \
+ ${PAX} -rw FontDataBase t1example1.c t1lib.config ${EGDIR}
+ ${SED} -e "s|@@X11BASE@@|${X11BASE}|g" \
+ -e "s|@@LOCALBASE@@|${LOCALBASE}|g" \
+ -e "s|@@PREFIX@@|${PREFIX}|g" \
+ ${FILESDIR}/t1lib.config.netbsd > ${EGDIR}/t1lib.config.netbsd
+
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/t1lib/PLIST b/fonts/t1lib/PLIST
index 1b374daeab4..2377da36cd3 100644
--- a/fonts/t1lib/PLIST
+++ b/fonts/t1lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/19 00:51:21 jlam Exp $
bin/type1afm
bin/xglyph
include/t1lib.h
@@ -97,4 +97,4 @@ share/t1lib/Fonts/type1/eufm10.pfb
@dirrm share/t1lib/Fonts
@dirrm share/examples/t1lib
@comment remove any rendered docs as well
-@unexec ${RM} -rf %D/share/doc/t1lib || true
+@unexec ${RM} -rf %D/share/doc/t1lib || ${TRUE}