diff options
author | jlam <jlam@pkgsrc.org> | 2002-09-21 06:49:24 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-09-21 06:49:24 +0000 |
commit | 23e500e23546c5d77d240cf539de828d0c6685a9 (patch) | |
tree | 8e8dfe15213845d86286411a50f4e851eac158c3 /cad | |
parent | c07721ed4e1b05951ab6953290168633a7f5d20a (diff) | |
download | pkgsrc-23e500e23546c5d77d240cf539de828d0c6685a9.tar.gz |
* buildlink1 -> buildlink2
* properly use PKG_SYSCONFDIR
* use bsd.pkg.install.mk instead of local DEINSTALL script
Diffstat (limited to 'cad')
-rw-r--r-- | cad/pcb/DEINSTALL | 18 | ||||
-rw-r--r-- | cad/pcb/MESSAGE | 22 | ||||
-rw-r--r-- | cad/pcb/Makefile | 69 | ||||
-rw-r--r-- | cad/pcb/PLIST | 58 | ||||
-rw-r--r-- | cad/pcb/distinfo | 4 | ||||
-rw-r--r-- | cad/pcb/patches/patch-ab | 4 |
6 files changed, 85 insertions, 90 deletions
diff --git a/cad/pcb/DEINSTALL b/cad/pcb/DEINSTALL deleted file mode 100644 index c2d9509ac39..00000000000 --- a/cad/pcb/DEINSTALL +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2002/05/31 19:56:19 dmcmahill Exp $ -# - -case "$2" in - DEINSTALL) cat <<EOF - -============================================================= -Note that the local library configuration file -(@pkg_sysconfdir@/pcb/local.inc) is not removed by the -deinstallation process. You should remove this by hand, if -you no longer need it. -============================================================= - -EOF - ;; -esac diff --git a/cad/pcb/MESSAGE b/cad/pcb/MESSAGE index f0aafc73946..228f6f94f8d 100644 --- a/cad/pcb/MESSAGE +++ b/cad/pcb/MESSAGE @@ -1,12 +1,18 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2002/09/12 17:09:58 wiz Exp $ +$NetBSD: MESSAGE,v 1.3 2002/09/21 06:49:24 jlam Exp $ -${PCB_CONFDIR}, $HOME/.pcb and the current working directory are -all included in the search path for m4 files. In addition, the -files "site-config.inc" (which would normally live in ${PCB_CONFDIR}), -"user-config.inc" (which would normally live $HOME/.pcb) and -"proj-config.inc" (in the working directory) are included if they -exist. This provides a mechanism for per-site, per-user, -and per-project libraries. +The following directories are all included in the search path for m4 files: + ${PKG_SYSCONFDIR} + ${HOME}/.pcb + the current working directory + +In addition, the files are included if they exist: + + site-config.inc (normally in ${PKG_SYSCONFDIR}) + user-config.inc (normally in $HOME/.pcb) + proj-config.inc (normally in the working directory) + +This provides a mechanism for per-site, per-user, and per-project +libraries. =========================================================================== diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 284f3ae6d3f..e548539518f 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/06/27 16:46:30 agc Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/21 06:49:25 jlam Exp $ # FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp # @@ -17,46 +17,53 @@ COMMENT= X11 interactive printed circuit board layout system DEPENDS+= m4-1.4:../../devel/m4 +USE_BUILDLINK2= yes USE_IMAKE= yes -INFO_FILES= pcb.info +PKG_SYSCONFSUBDIR= pcb +DOCDIR= ${PREFIX}/share/doc/pcb +EGDIR= ${PREFIX}/share/examples/pcb +INFODIR= ${PREFIX}/info +M4DIR= ${PREFIX}/lib/x11/pcb/m4 -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL +INFO_FILES= pcb.info +CONF_FILES= ${EGDIR}/local.inc ${PKG_SYSCONFDIR}/local.inc -PCB_CONFDIR= ${PKG_SYSCONFDIR}/pcb -MESSAGE_SUBST+= PCB_CONFDIR=${PCB_CONFDIR} # avoid picking up any user config files during the build MAKE_ENV+= HOME=${WRKSRC} post-patch: - ${MV} -f ${WRKSRC}/config.h ${WRKSRC}/config.h.bak - ${SED} 's;@pkg_sysconfdir@;${PCB_CONFDIR};g' ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h - -pre-install: - ${SED} 's;@pkg_sysconfdir@;${PKG_SYSCONFDIR};g' ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + for file in ${WRKSRC}/config.h; do \ + ${SED} -e "s|@sysconfdir@|${PKG_SYSCONFDIR}|g" \ + $${file} > $${file}.fixed; \ + ${MV} -f $${file}.fixed $${file}; \ + done post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/pcb/ - ${INSTALL_MAN} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/pcb/ - ${INSTALL_MAN} ${WRKSRC}/doc/pcb.html ${PREFIX}/share/doc/pcb/ - ${INSTALL_MAN} ${WRKSRC}/doc/pcb.info ${PREFIX}/info/ - ${INSTALL_MAN} ${WRKSRC}/doc/pcb.ps ${PREFIX}/share/doc/pcb/ - ${INSTALL_MAN} ${WRKSRC}/doc/refcard.ps ${PREFIX}/share/doc/pcb/ - ${INSTALL_DATA_DIR} ${PCB_CONFDIR} - if [ ! -f "${PCB_CONFDIR}/local.inc" ]; then \ - ${ECHO} "# list your local includes here" > ${PCB_CONFDIR}/local.inc ; \ - fi - ${MV} -f ${X11PREFIX}/lib/X11/pcb/m4/common.m4 ${X11PREFIX}/lib/X11/pcb/m4/common.m4.bak - ${AWK} '/^divert\(0\)dnl/ { \ - printf("include(${PCB_CONFDIR}/local.inc)\n"); \ - printf("sinclude(site-config.inc)\n"); \ - printf("sinclude(user-config.inc)\n"); \ - printf("sinclude(proj-config.inc)\n"); \ - } \ - {gsub(/^include\(/,"include(${X11PREFIX}/lib/X11/pcb/m4/"); print } ' \ - ${X11PREFIX}/lib/X11/pcb/m4/common.m4.bak > ${X11PREFIX}/lib/X11/pcb/m4/common.m4 - ${RM} -f ${X11PREFIX}/lib/X11/pcb/m4/common.m4.bak + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/index.html ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/pcb.html ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/pcb.info ${INFODIR} + ${INSTALL_DATA} ${WRKSRC}/doc/pcb.ps ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/refcard.ps ${DOCDIR} + for file in ${M4DIR}/common.m4; do \ + ${AWK} ' \ + /^divert\(0\)dnl/ { \ + printf("include(${PKG_SYSCONFDIR}/local.inc)\n"); \ + printf("sinclude(site-config.inc)\n"); \ + printf("sinclude(user-config.inc)\n"); \ + printf("sinclude(proj-config.inc)\n"); \ + } \ + { + gsub(/^include\(/,"include(${M4DIR}/"); \ + print; \ + }' \ + $${file} > $${file}.fixed; \ + ${MV} -f $${file}.fixed $${file}; \ + done + ${INSTALL_DATA_DIR} ${EGDIR} + ${ECHO} "# list your local includes here" > ${EGDIR}/local.inc .include "../../mk/texinfo.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/pcb/PLIST b/cad/pcb/PLIST index 9173693ade0..7408a4404f8 100644 --- a/cad/pcb/PLIST +++ b/cad/pcb/PLIST @@ -1,56 +1,56 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:03 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/09/21 06:49:25 jlam Exp $ bin/pcb -@unexec ${INSTALL_INFO} --delete %D/info/pcb.info %D/info/dir info/pcb.info -@exec ${INSTALL_INFO} %D/info/pcb.info %D/info/dir lib/X11/app-defaults/Pcb -lib/X11/pcb/default_font -lib/X11/pcb/pcblib -lib/X11/pcb/pcblib.contents lib/X11/pcb/CreateLibrary.sh lib/X11/pcb/CreateLibraryContents.sh lib/X11/pcb/ListLibraryContents.sh lib/X11/pcb/QueryLibrary.sh +lib/X11/pcb/default_font +lib/X11/pcb/m4/TTL_74xx_DIL.list lib/X11/pcb/m4/TTL_74xx_DIL.m4 -lib/X11/pcb/m4/crystal.m4 +lib/X11/pcb/m4/common.m4 +lib/X11/pcb/m4/connector.inc +lib/X11/pcb/m4/connector.list lib/X11/pcb/m4/connector.m4 -lib/X11/pcb/m4/generic.m4 -lib/X11/pcb/m4/linear.m4 -lib/X11/pcb/m4/logic.m4 -lib/X11/pcb/m4/lsi.m4 -lib/X11/pcb/m4/memory.m4 -lib/X11/pcb/m4/optical.m4 -lib/X11/pcb/m4/resistor_array.m4 -lib/X11/pcb/m4/resistor_0.25W.m4 -lib/X11/pcb/m4/texas_inst_amplifier.m4 -lib/X11/pcb/m4/texas_inst_voltage_reg.m4 -lib/X11/pcb/m4/transistor.m4 -lib/X11/pcb/m4/TTL_74xx_DIL.list lib/X11/pcb/m4/crystal.list -lib/X11/pcb/m4/connector.list +lib/X11/pcb/m4/crystal.m4 +lib/X11/pcb/m4/dil.inc lib/X11/pcb/m4/generic.list +lib/X11/pcb/m4/generic.m4 lib/X11/pcb/m4/linear.list +lib/X11/pcb/m4/linear.m4 lib/X11/pcb/m4/logic.list +lib/X11/pcb/m4/logic.m4 lib/X11/pcb/m4/lsi.list +lib/X11/pcb/m4/lsi.m4 lib/X11/pcb/m4/memory.list +lib/X11/pcb/m4/memory.m4 +lib/X11/pcb/m4/misc.inc lib/X11/pcb/m4/optical.list -lib/X11/pcb/m4/common.m4 -lib/X11/pcb/m4/resistor_array.list +lib/X11/pcb/m4/optical.m4 +lib/X11/pcb/m4/plcc.inc +lib/X11/pcb/m4/qfp.inc lib/X11/pcb/m4/resistor_0.25W.list +lib/X11/pcb/m4/resistor_0.25W.m4 +lib/X11/pcb/m4/resistor_array.list +lib/X11/pcb/m4/resistor_array.m4 lib/X11/pcb/m4/texas_inst_amplifier.list +lib/X11/pcb/m4/texas_inst_amplifier.m4 lib/X11/pcb/m4/texas_inst_voltage_reg.list -lib/X11/pcb/m4/transistor.list -lib/X11/pcb/m4/connector.inc -lib/X11/pcb/m4/dil.inc -lib/X11/pcb/m4/misc.inc -lib/X11/pcb/m4/qfp.inc -lib/X11/pcb/m4/plcc.inc +lib/X11/pcb/m4/texas_inst_voltage_reg.m4 lib/X11/pcb/m4/to.inc +lib/X11/pcb/m4/transistor.list +lib/X11/pcb/m4/transistor.m4 +lib/X11/pcb/pcblib +lib/X11/pcb/pcblib.contents man/cat1/pcb.0 share/doc/pcb/index.html share/doc/pcb/pcb.html share/doc/pcb/pcb.ps share/doc/pcb/refcard.ps +share/examples/pcb/local.inc +@dirrm share/examples/pcb +@dirrm share/doc/pcb @dirrm lib/X11/pcb/m4 @dirrm lib/X11/pcb -@dirrm share/doc/pcb diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo index f823d88e391..ea245a97aba 100644 --- a/cad/pcb/distinfo +++ b/cad/pcb/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.4 2002/06/01 20:11:55 dmcmahill Exp $ +$NetBSD: distinfo,v 1.5 2002/09/21 06:49:25 jlam Exp $ SHA1 (pcb-1.6.3.tgz) = 79cca1a0ed9567cefd2e98556e1895c86e453010 Size (pcb-1.6.3.tgz) = 577803 bytes SHA1 (pcb-docs-1.6.3.tar.gz) = d645df42d7a9758f2112f02f47530eb2c05128a7 Size (pcb-docs-1.6.3.tar.gz) = 252728 bytes SHA1 (patch-aa) = 348159ad2c6d0eef4c61bbbd0ff2b30eec3f5728 -SHA1 (patch-ab) = c035596d9981968e1faf80390a778b31ca807154 +SHA1 (patch-ab) = 8c34420992a047c93a29dbc3d51f8516a0c9b8d3 SHA1 (patch-ac) = 39f423dddd3bce9bd6c625cde9aa5ccb1831ac9d SHA1 (patch-ad) = 9edcce665f1a930f857b8ffd65a25c4dad5fa289 SHA1 (patch-ae) = 3b0b42796c2e8fd5d6d221293593e1e4f80ff660 diff --git a/cad/pcb/patches/patch-ab b/cad/pcb/patches/patch-ab index 2002644a3fc..16fa6adb69b 100644 --- a/cad/pcb/patches/patch-ab +++ b/cad/pcb/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2002/06/01 20:11:55 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.3 2002/09/21 06:49:26 jlam Exp $ --- config.h.orig Wed Jan 28 17:28:11 1998 +++ config.h Wed Jan 28 17:29:04 1998 @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/01 20:11:55 dmcmahill Exp $ * the name of GNU m4 (you MUST use GNU m4) */ -GNUM4 = m4 -+GNUM4 = "gm4 -I@pkg_sysconfdir@ -I\$$HOME/.pcb -I." ++GNUM4 = "gm4 -I@sysconfdir@ -I\$$HOME/.pcb -I." /* ---------------------------------------------------------------------- * BTNMOD determies the modifier key to be used for the |