Commit graph

31 commits

Author SHA1 Message Date
joerg
ccd7e56ff4 Replace use of traditional CPP with AWK. This fixes one expansion bug
and additionally works with clang. Discussed with obache.
2012-07-03 17:44:39 +00:00
obache
ed8b73e129 Drop dependency on nbitools.
nbitools is not enough to maintain for recent platforms and no good support for
user-destdir (now, canna-lib and canna-canuum is user-destdir ready)

no objection in tech-pkg-ja@ about three months.
2010-05-28 11:06:34 +00:00
abs
9433d4d499 PKG_DESTDIR_SUPPORT=destdir 2009-12-23 21:46:10 +00:00
joerg
45656cf39c Remove @dirrm entries from PLISTs 2009-06-14 18:00:32 +00:00
joerg
2d1ba244e9 Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
2009-03-20 19:23:50 +00:00
taca
1a116e4c6e Bump PKGREVISION of inputmethod/canna* packages. 2008-09-18 12:35:27 +00:00
jlam
c16221a4db Change the format of BUILDLINK_ORDER to contain depth information as well,
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto
2006-07-08 23:10:35 +00:00
jlam
9430e49307 Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
2006-07-08 22:38:58 +00:00
jlam
366f3b7f81 * Convert to USE_TOOLS+=itools instead of including nbitools/buildlink3.mk.
* Fully convert to the pkginstall framework by using it to manage
  directories required at install time.

* Rewrite the canna rc.d script to ensure that all needed directories
  are present before the daemon is started.

* Miscellaneous touch ups to the DESCR and MESSAGE files.

* Remove the need to explicitly set PREFIX.  These packages now install
  into ${LOCALBASE} and use symlinks and file copies to put the files
  into the ${IMDICTDIR}.

Bump the PKGREVISIONs for the canna* packages.
2006-07-05 04:48:28 +00:00
rillig
96fc47c14f Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.
2006-04-12 10:26:59 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
joerg
35b69cfb04 Do some post-cleanup of the libraries for DragonFly until I find out,
why imake doesn't do it itself.
2005-12-29 15:33:45 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
wiz
f7906f6e94 Unused. 2004-04-26 09:21:57 +00:00
jlam
426cc1ce72 Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>,
e.g. "BUILDLINK_PKGBASE.gtk?= gtk+".  This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.
2004-03-29 05:05:32 +00:00
minskim
21445b6848 Match the new buildlink3.mk template. 2004-03-05 21:08:52 +00:00
minskim
7b11ce524f Make Canna* packages use the buildlink framework. It will fix the
build problem reported by Yasushi Oshima on tech-pkg-ja@jp.NetBSD.org.
2004-03-05 19:09:22 +00:00
uebayasi
241fddd816 1) Update Canna to 3.6p4.
* Reconstruct sample init files.
* RC-style start script.
* Auto-registration of Kana conversion.
* Abolish fuzokugo.cld.
* More key symbols can be configured with Lisp.
* Server returns more appropriate values at abort.
* TeX document improvements.
* And many bug fixes.

2) Make Canuum use Canna's common make files.  From Osamu Oishi in PR 22244.
2003-09-23 15:06:57 +00:00
uebayasi
028d988779 Update/simplify/improve DESCR/MESSAGE of Canna packages. The MESSAGE part
is from Takamizu-san.

(I dare to delete the explanation for Mule.  It's minor, and too old.)
2003-06-09 09:36:35 +00:00
uebayasi
997db7b9d5 * Correct version numbers, (3.6.3 ->) 3.6p3 -> 3.6pl3.
To update packages, you need to run pkg_delete(8) manually and de-install
  old 3.6.3 packages.  Agreed by Kambe-san.

  See the pkg_info(1) manual page for how "pl" works.

* White space nits.
2003-06-03 00:58:10 +00:00
taca
4a2af37940 This distinfo file isn't used any more, ../canna/distinfo is used now. 2003-06-01 07:11:19 +00:00
uebayasi
9b637257eb * Move to use inputmethod/canna/Makefile.{common,include} for common
definitions/inclusions.

* Deprecate canna-server and introduce inputmethod/canna as the new
  Canna meta package.
2003-05-31 08:28:33 +00:00
uebayasi
b4c24525c5 Update Canna to 3.6p1.
Changes from 3.5b2 are:
	* Add -inet option not to allow TCP connections by default.
	* Fix a buffer overflow.  (This fix was already incorpolated
	  in Pkgsrc version.)
	* Improve dicionary.
	* Improve conversion engine.
	* Other bug fixes.

Patch is made by Yoshifumi Hiramatsu.  Tested by Toru Takamizu.
2002-12-27 08:41:23 +00:00
itojun
14a5288176 apply point patch to solve remote buffer overrun vuln.
(should upgrade to 3.6p1)
http://canna.sourceforge.jp/sec/Canna-2002-01.txt
2002-12-02 03:40:20 +00:00
wiz
d4af17a217 Unused. 2002-10-25 17:13:49 +00:00
jlam
efb93b17bd Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
2002-08-25 19:21:43 +00:00
grant
618961e568 check that USE_INET6 is defined.
remove extraneous parenthesis around .if (${FOO} ..) conditions.
2002-08-21 02:43:44 +00:00
jlam
c6beaeadc6 Rewrite canna rc.d script so that it more closely resembles other pkgsrc
rc.d scripts.  This should now honor $canna settings in /etc/rc.conf.
This addresses pkg/17543 by itojun.
2002-08-07 07:43:32 +00:00
uebayasi
fa305b2450 Missed symlinks of shared libraries. Pointed out by Toru TAKAMIZU. 2002-07-19 14:50:06 +00:00
sakamoto
1b081a9e7c bump PKGREVISION.
add buildlink.mk.
use devel/nbitools instead of ${X11BASE}/xmkmf.
purge /var/dict/canna.
2002-06-10 09:47:26 +00:00
seb
b99ed58120 Reimport of package Canna-lib from japanese/canna-lib into inputmethod/canna-lib.
This is part of the japanese category retirement.
CATEGORIES adjusted.
2002-05-31 13:00:58 +00:00