Commit graph

160 commits

Author SHA1 Message Date
obache
1d9df3258a recursive bump from gettext-lib shlib bump. 2011-04-22 13:41:54 +00:00
wiz
af3596f984 png shlib name changed for png>=1.5.0, so bump PKGREVISIONs. 2011-01-13 13:36:05 +00:00
obache
61df90e06e * exactly disable TTF detection.
* tell Mesa, XPM, Xinerama and XDPMS manually instead of fancy configure.
  Then those features are enabled with native X.

Those changes should resolve PR#40662.

Bump PKGREVISION.
2010-12-08 12:54:30 +00:00
abs
9987fa4b3a PKGREVISION bumps for changes to gtk2, librsvg, libbonobo and libgnome 2010-11-15 22:56:08 +00:00
wiz
200e3c4a04 Bump dependency on pixman to 0.18.4 because cairo-1.10 needs that
version, and bump all depends.

Per discussion on pkgsrc-changes.
2010-09-14 11:00:44 +00:00
wiz
e8d8834f6a Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
2010-06-13 22:43:46 +00:00
asau
b0ff41f3a2 This needs Xinerama. Unbreak it. 2009-11-02 11:51:43 +00:00
tron
04afd4b9ba Update "xlockmore" and "xlockmore-lite" packages to version 5.29.1.
Changes since version 5.28:
- Undo a cleanup in vroot.h, as xlock exits on startup with a BadWindow
  on pievwm and tvtwm.
- juggler3d mode stolen from xscreensaver with help from Tim Auckland.
  Jouk Jansen made safe for VMS and fixed colour problem.
- nose: cleaned up for win32.  Still do not know why this mode has
  bottom task bar.
- petri: crashed due to shift of int, fix from Dr Nigel Warr
  <warr AT kp.uni-koeln.de>.  petri improved for win32, should not be
  red all the time now.
- penrose should be working again.  Other small fixes for life, etc.
- image: image set right away and added option -icononly to only display
  image when in password window
- Xinerama patch so the password window will be displayed on one screen
  thanks to Kaelyn Uhrain <satyr_22901 AT yahoo.com>.  (On the wish
  list would be to have password window on screen with mouse instead
  of first screen.
- SuSE patch set thanks to Stanislav Brabec <sbrabec AT suse.cz> and
  Petr Gajdos <pgajdos AT suse.cz>.  For problems in code and compiler
  warnings: fixes build with GLTT and FTGL modules, return if fontset
  is null instead of crash, fixes strict-aliasing compiler warning,
  makes void function not returning anything.
- life3d: resync with my Java code for new patterns.
- xlockrc (use of xlock without system password) did not actually check
  if Key portion matched Again portion.  Also now deletes null .xlockrc
  file when there is a mismatch.
2009-10-25 22:54:03 +00:00
sborrill
2cfc565bdd Set app-defaults folder so it is in ${PREFIX} (previously tried to install
in /usr/lib).
Bump PKGREVISION
2009-10-20 13:15:29 +00:00
dsainty
32036d325c Fix execution of 'configure' under shells that dislike if-fi with no
intermediate block (Linux here, but probably Solaris too).

Whilst here, remove a cosmetic patch hunk.
2009-10-15 21:24:26 +00:00
tnn
377d7caf50 don't leak WRKDIR into run path.
Bump revision.
2009-09-30 14:59:06 +00:00
sno
6f7368d4db bump revision because of graphics/jpeg update 2009-08-26 19:56:37 +00:00
joerg
b02a0f888e Remove @dirrm entries from PLISTs 2009-06-14 18:24:43 +00:00
tron
825becfdf0 Update "xlockmore" package to version 5.28. Changes since 5.27:
- invert: build failures from Sun Studio Express C++ like this:
    Error, manymatchover: Overloading ambiguity between "operator^(const
    TwoJet, double)" and "built-in operator^(int, int)" fixed by casting
    to double, thanks to Tim Mooney <Tim.Mooney AT ndsu.edu>.
- life3d:
    4 more rhombic dodecahedron S3/B3 patterns including a period 4 pattern
      (only S3/B3 period 2 and less patterns left from Bays' papers).
    Glider code revamped to make more maintainable, using populateGlider().
    unsigned int fix thanks to Jouk Jansen.
    Added new cube gliders from Bays 2006 3D Life paper and found a few
      patterns for the gliders to crash into.  (S23B5, S25B5, S27B5, S35B5,
      S36B5, S37B5, S38B5, S4B5, S47B5, S57B6, S58B5, S8B5).
    New mode option added "+draw", this turns off drawing to the screen
      to speed up searches, and more importantly, make less annoying :)
- life: resyncing with my Java code.
    Switched how static triangular forms are stored
    Added a lots of new triangular patterns, including 2 gunship triangular
      patterns.  Also added handful of other patterns.
    Reading memory on uninitialized variables fix thanks to Jouk Jansen.
    "+draw" mode option added.
    Pentagonal (Cairo Tiling) life added with glider shooters.
      "xlock -mode life -rule S23B346 -neighbors 7" or
      "xlock -mode life -pent2".
    New gliders found by David Bagley, one in 5 neighbors pentagonal life
      (-rule S24B2) "xlock -mode life -pent", the other in 9 neighbor
      triangular life "xlock -mode life -neighbors 9" (-rule S3B34).
      Associated periodic patterns for each added.
    Added more symmetries and now have all the random symmetries
      (at least I think so) for squares, hexagaons, triangles, and
      pentagons.
- Macro FTGL213 added for new FTGL library.  If you need it to compile
    text3d2.cc, make sure it compiles with -DFTGL213.  Should work
    automatically for VMS though, thanks to Jouk Jansen.

Approved by Hubert Feyrer.
2009-04-16 12:31:18 +00:00
tron
a49c651521 Remove "MASTER_SITE_XCONTRIB" from master site list. The last "xlockmore"
archive present on those servers was released in 2001.
2008-10-07 10:46:50 +00:00
hubertf
ad85bdcd6d Update x11/xlockmore to 5.27. Changes:
PAM_putText() would set pointer resp->resp to buffer.  This will work
    until memory is reused.  Thanks to Howard Kash <hmkash AT arl.army.mil>.
  ico updated to show the two edge transitive Catalan solids, i.e. the
    rhombic dodecahedron and the rhombic triacontahedron.
  Added __linux__ to define list to allow newer sig masking to get rid of
    pesky deprecated message.
  configure checks for libXdpms
    libXext has the DPMS functionality on both XFree86 4 and X.org.
    (libXdpms may be Xfree86 3.x). Added /usr/pkg/lib and /usr/pkg/include to
    long list of paths it checks in.
  life added more life forms triangular life from Bays' paper and added
    S245B3 with glider (-neighbors 8) from Bays' paper.  Found some
    patterns in S245B3 for the glider to crash into.
  life3d -rule S45/B4 -neighbors 18 and -rule S45/B4 -neighbors 20 from
    Bays' paper.  Found some patterns for the gliders to crash into.
  life3d -search added.  Need to add more symmetries for 3D.
  life3d -rule S3/B3 -neighbors 12 and -rule S456/B3 -neighbors 12.  Added
    a bunch of patterns from Bays' papers but not all.  -neighbors 12 now
    a rhombic dodecahedron instead of a cube.
  ant3d -neighbors 12 (3d bees). Added eyes option to this.
  Just noticed solitaire a mode I added was spelled wrong, ie it was spelled
    without the second "i".  Fixed a goof in solitaire.cc.
2008-10-06 22:40:12 +00:00
hubertf
1752f40f51 Update xlockmore to 5.26.1. Changes:
5.26.1
  PAM_putText() would set pointer resp->resp to buffer.  This will work
    until memory is reused.  Thanks to Howard Kash <hmkash AT arl.army.mil>.

5.26
  "Esc" key now resets password entry.  Do not put an escape in your
     password.  This should behave the same as Control-U.
  -showdate added.  +showdate allows you to turn off date in password
    window.  Also fixed centering for this.
  Inverted bitmap for xlock.  Added a icon for VMS.
  Updated the Java launcher in xlock.
  antic cleanups.  It found a few minor bugs but mostly makes the code more
    readable (without being too overbearing IMHO).  The current version trips
    on #ifdefs though.
  New mode pyro2: -mode pyro2 -msg 'MSGSTR' -fnt 'FONT'
    MSGSTR consists of following elements:
      EXPLOSION is one of &0, &1, ... &9, &a, .. &f each of which presents a
        different type of explosion.
      TEXT is a text string like 'linux'. the string may contain blanks.
        '\n' is interpreted as a new line.
        '\\' is a backslash.
        '\&' is an ampercent.
      LOGO is the sign #. An exploding penguin or other icon will be shown.
      FONT is something like '-*-helvetica-bold-r-*-240-*' the font to be used.
    Thanks to Pezhman Givy  <phg AT snafu.de>.
    Modifications for +install, -mono, and Windows.
  New resource files for Chinese... Xlock-zh_TW.ad, resource-msg-zh_TW.h,
    xlock-msg-zh_TW.h.  Thanks to Wei-Lun Chao <chaoweilun AT gmail.com>.
    Following this example, I split out the different languages from XLock.ad
    as it seemed odd when editing and did not want to corrupt anything,
    especially if I could not verify it.
  Automata modes now have triangular tilings drawn with a black
    triangle around it.  Fixed dilemma, for it only is interesting with 4 or
    8 neighbors.
2008-08-26 23:18:53 +00:00
joerg
c65db87582 Don't use the special permissions from configure, but annotate them
directly. The OSF setgid is currently left out. Add DESTDIR support.
2007-10-28 16:06:04 +00:00
hubertf
d34ad79ba8 Update xlockmore to 5.25. Changes:
Renamed xlockrc.rc to xlock95.rc.
  win95 settings fixes from Frank Fesevur
    'Enabled' checkbox set in the savers configuration for is honored
        when the random mode is selected.
    Dialog rearranged to allow more room for Delay/Count/Cycles.
    Version is now displayed.
  ant3d,ant,life1d now with better colors.  Really looked bad on Windows 95.
  rain a new mode from Frank Fesevur.
  Patch for running stuff like "xlock95.scr -s ant3d" thanks to
    Frank Fesevur <ffes AT users.sourceforge.net> which makes testing
    and showing a particular mode much easier.
  Fix for xlock -resource in life.c.
  Added a compile-time option "-DNO_TIME if you dont want the time in the
    password window.
2007-09-28 12:42:40 +00:00
hubertf
6fb0e28d63 Update xlockmore to 5.24. Changes:
penrose added to xlock95 ("far" changed to "faraway" to compile).
    xcl added with a fix for DefaultScreen, which should not be
    there since xlock is a multiscreen program.
  Created packaging scripts in etc with input of releases to make
    it easier for me for release and zip.  It gets version from
    xlock/version.h .
  Changed pgsz and txsz variables in my man2html so it does not cause
    corruption in generated xlock.html from man page.
  Patch for solitare and reducing binary size for xlock95 thanks to
    Frank Fesevur <ffes AT users.sourceforge.net>.
  dilemma, voters, wator hexagonal/triangular drawing improvements.
  More triangular/hexagonal life from Carter Bays.
    http://www.cse.sc.edu/~bays/CAhomePage
    Fixes for old options for command line -rule S2b34B2a and
      -rule S2a2b4aB2a3a4b using -neighbors 6 .
    Fixes for hexagonal diagonal shooters.
    Added new hexagonal life -rule S35B2 and S3B245.
    Added many new triangular life rules with gliders.
    Updated random soup to include multiple symmetries.
    Added options runtime -glidersearch and -patternsearch, to be used with
      big values of cycles and count ie. -cycles 1000 -count 100000000
    Added -repeat num option to help find patterns that do not repeat in num
     periods.  This will output a pattern in cycles - num .  If compared to
     the output of cycles, one can see if a new pattern may have been
     discovered.
  Added -vertical option to ant, bug, demon, dilemma, dragon, life, loop,
    voters, wator, wire, these affect triangles and hexagons and crystal
    which affects parallelograms.
  DirectColor fixes for password window thanks to Jouk Jansen [still under
    development under DIRECTCOLOR_FIX].
2007-04-21 11:26:02 +00:00
wiz
601583c320 Whitespace cleanup, courtesy of pkglint.
Patch provided by Sergey Svishchev in private mail.
2007-02-22 19:26:05 +00:00
joerg
d26cf36e57 - fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
  via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
  in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
  C++ for compilation without including the proper headers

Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
2006-12-27 13:37:35 +00:00
joerg
178957d082 Switch to modular buildlinks. 2006-11-06 10:04:42 +00:00
hubertf
944ca80782 Update xlockmore and xlockmore-lite to 5.23.
Changes:
* Fixed core for toneclock (fixed similar code in ico).
  Remove XSetFont on global GC dclock, marquee, nose, puzzle, xjack,
    bomb.
  image now can handle messages xlock -mode image -message "unicycle"
    If message is too big for little window it will randomly move
    around.
  solitare draw line errors fixed.
  dclock to handle user defined messages (nothing really to do with
    a clock, actually, but the man page already says
    "Shows a floating digital clock or message").
  nose mode tried to simplify talking code and fix small bugs like
    do not print tabs (it prints a box char for me) or not handling
    linefeeds correctly at end of message.
* DirectColor fix thanks to Jouk Jansen.
  Mallocing for error should check success pointed out by Dan Lukes.
    Using method in xlock.c, with some changes, did similar changes for
    passwd.c and resources.c
  PAM checking allocation fix and null resistant ReadXString thanks to
    Dan Lukes <dan AT obluda.cz>.
  Added stipples to life3d.  Noticed ant3d would probably leak if in
    mono... fixed.
  thick option for maze thanks to Alex Austin <circuitsoft.alex AT
    gmail.com>.  Also changed MINGRIDSIZE to 2.  Removed extra pixel space
    to the right and bottom of path... some people may like this so its
    an option... threed (not really 3D, a better name would be nice).
  fzort fix for uninitialized memory read thanks to Mauro Persano
    <mauro_persano AT yahoo.com>
  Fix to avoid running OpenGL on a StaticGray, GrayScale, and StaticColor
    on Sun.  Sun's glxCreateContext core dumps on Solaris 10.
  Turned off XRaiseWindow for Cygwin as it was stopping me from logging in.
  Added -DSYNCHRONIZE option to config.h.in for help in debugging X errors.
  Fixed a problem with random colors from petri mode PseudoColor.
2006-10-20 12:38:48 +00:00
joerg
dd778f5fd8 Without pkg-config, xglock is not build. 2006-06-20 16:02:14 +00:00
tron
88fb06ef60 Reset package revision after recent updated. Approved by hubertf@. 2006-05-09 10:57:29 +00:00
hubertf
2944de12dd Update to xlockmore{,lite} 5.22. Changes:
* fiberlamp fix for array bounds read and leak fix for deluxe
+ magick and raster file (ras) fixes for True Color by Jouk Jansen
  Removed some compiler/lint warnings.
  deluxe mode ported from xscreensaver by Jouk Jansen.
  anemone mode ported from xscreensaver by Jouk Jansen
  win32 changes from Petey Leinonen:
    added XPutPixel()
    pacman now works by changing the initialization and now can create a
    1 bit depth bitmap when asked for.

* new since BETA
+ update since BETA
2006-05-08 19:28:48 +00:00
wiz
02f8f7c52d Bump BUILDLINK_ABI_DEPENDS.png and PKGREVISION for png-1.2.9nb2 update. 2006-04-17 13:45:57 +00:00
jlam
bafe7402ac audio/oss/buildlink3.mk is no more after audio/oss was removed from
pkgsrc.
2006-03-09 20:31:58 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
wiz
768c589c29 Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
2006-01-24 07:31:52 +00:00
tron
5ce377c524 Add missing entry "bin/xgclock" and really bump package revision. 2006-01-21 05:05:15 +00:00
tron
eb40cb2a7f Add missing file "share/xlock/xglockrc" to package list for the
"xlock" package, bump package revision.
2006-01-20 13:15:45 +00:00
joerg
de50e238f7 Remove manual app-default parameter again, now that the underlaying
issue has been solved. No package change, no revision bump.
2006-01-12 19:37:44 +00:00
hubertf
0dece82cad Update xlockmore to 5.21. Changes:
* Removed random colors from petri mode.  Found that it could cause a fatal
*   error on PseudoColor.  (Will try to fix better on next release.)
+ PAM update from Yuri Bushmelev <jay-dev AT simcom.ru> fixes an
+   initialization problem PAM_conv function and made cleaner and friendly.
+   BAD_PAM fixed.
  fzort mode by Mauro Persano <mauro_persano AT yahoo.com>... its not a
    OpenGL mode but it looks like it is.  Try using with -mono also.
    Tom Schmidt found an as of yet unresolved Uninitialized Memory read,
    see Purify logs.
  dclock -binary option added thanks to Petey Leinonen (he saw the
    original on thinkgeek).
  Non-compatible routines for shared memory workaround for VMS when using
    libs MMOV(Multimedia for sounds) and DECWINDOWS thanks to Jouk Jansen.
  mandelbrot options added thanks to Tim Auckland
    update from Jouk Jansen to avoid log of 0
    -alpha adds detail to the interior of the set by displaying level sets
    of "closest return", ie how close does the orbit of z come back to its
    starting point z=0.  These show minima around the center of each bud.
    -index is similar, but displays at which iteration the closest return
    occurs.  These show a fibonacci branching structure from the base of
    each bud, ie each adjacent pair of domains surrounds a domain whose
    index is the sum of the indices of its neigbours.
    -lyap option for colours in the interior of the set according to an
    estimate of the Lyapunov exponent.  (Not to be confused with real plane
    Lyapunov fractals).  Also now allow -binary and -dem.
  New random mode for win32, compile with -DRANDOMMODE .
    It seems to bomb out if you run it for a while, so I did not make it
    the default.
  win32 changes from Tim Auckland:
    new configure dialog
    random mode done to enable
  win32 changes from Petey Leinonen:
    fixes for nose and life1d
    matrix mode works with the 2 following changes
    fixed XCopyArea() for destinations that are not windows (ie a bitmap)
    fixed XCreatePixmapFromBitmapData() so it always creates a pixmap
      regardless of depth ( creates the Windows bitmap with 1 bit depth),
      and apply the foreground and background colors.
    XCopyArea, XSetTSOrigin, XSetFillRule fixes and got these modes to work:
    bat, bounce, dilemma, eyes, image, nose, pacman,
    shape, slip, star, starfish, wator, world
  unlock delay from lgx <lgxror AT gmail.com>  [it was explained to me
    but still not sure why you would use it]

 + new update since BETA
 * new since BETA
2006-01-09 21:18:31 +00:00
tron
50e0f7dc49 Fix installation path of application defaults file "XLock" which ended up
in "${X11BASE}/lib/X11/app-defaults" instead of
"${LOCALBASE}/lib/X11/app-defaults". Bump package revision after contents
of binary package has been corrected.
2006-01-07 12:04:48 +00:00
rillig
579e977969 Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
2005-12-05 23:55:01 +00:00
wiz
f63ba8662e Convert USE_OSS to oss option. 2005-12-01 19:17:54 +00:00
hubertf
7e46896adf Base DIST_SUBDIR on DISTNAME, and
add a comment to remove it on next update (note to myself...)
2005-11-09 02:40:22 +00:00
wiz
49eadbdf55 Set DIST_SUBDIR properly for changed distfile. 2005-11-08 17:53:18 +00:00
cjs
893c68baa8 The distribution file on the master site has changed; these are the checksums
for the "new" version. This is, when uncompressed, byte-for-byte identical
with the uncompressed old version; only the compression has changed.
2005-11-08 07:50:01 +00:00
hubertf
c911d275f6 Update xlockmore to 5.20.1.
XXX someone please test the PAM stuff on >=3


Changes:

"I goofed up the versioning on 5.20... so I wiped it out
and put a new 5.20.1 up "

5.20
  win32 changes from Tim Auckland:
*   Faster starting fix
    general install fix
    flow now uses PolyDraw... making it run faster
    Juggle cleaned up Arc drawing and
    XQueryFont now returns a dummy font (which XDrawString ignores)
    fiberlamp now jiggles
    XTranslateCoordinates fixed, Arc fixes, and  pattern label disabled
    for juggle...
  win32 changes from David Bagley:
*   New bitmaps and pixmaps.  Makefile change so maze uses one.
    shifted text printing in api and on apollonian mode
    polyominoes looks better because I changed the meaning in the Api
      for DrawRectangle.  It now just draws a rectangle outline.
    added julia life life1d swarm tetris
    voters inverted but this uses xbm?
    made FULL_RANDOM the default
    fixed much of xjack (except when it gets to bottom of screen)
    Labeling now on right side and aligned.
    Change the name from xlockmore95.scr to xlock.scr.
    Added a new ico file.
    I added 17 modes on top and took out some warnings.
  Merged with xlockmore95-0.11 with thanks to author Petey Leinonen
    <petey_leinonen AT yahoo.com.au>.  See win32 readme.txt and todo.txt.
    double buffering implemented, transparent background for text,
      XPutImage fixes, XCreateImage added
    Currently, it is not easy to select a specific mode and some modes
    need work.
  Modified life and life1d sizing to be more variable when there
*   is no bitmap.  Also thanks to Tom Schmidt for a non Grelb icon fix.
  voters modified to have proper colors for Democrats and Republicans.
    As a left wing liberal, I just had to add the "Green" bitmap.
    Old commie icon available as compile time option (but will be green).
  New portable method for locking Virtual Terminals (vt). Added to README.
    Thanks to Sergei Golubchik <sergii AT pisem.net>.
  Allow xlockrc to allow passwords of any length (not just 8) thanks to
    <Manuel.Reimer AT gmx.de>  (actually it just ignores characters after
    the 8th character... but now ignores it in a more consistent way).
  make.com modified to use IEEE floats instead of VAX-floats thanks to
    Jouk Jansen.
  Changed default for PAM (since I have got a few mails about it).  Compile
    OD_PAM (sorry did not know what else to call it) if you like the old
    way.  GenToo and (most?) other Linux versions should compile by default.
2005-11-05 06:19:57 +00:00
minskim
6c3afcf56d Make sure that configure finds the correct app-defaults directory. 2005-09-18 19:16:49 +00:00
hubertf
9be1074774 Replace XLOCK_DISABLE_ALLOW_ROOT and XLOCK_NO_DPMS
by options 'xlockmore-allow-root' and 'xlockmore-dpms'
which are on by default - disable them to get the effect
of the two variables.

Suggested & reviewed by wiz.
2005-09-11 16:55:38 +00:00
hubertf
70c403974e If XLOCK_DISABLE_ALLOW_ROOT is defined, add --disable-allow-root
to configure options to prevent root from being able to get into
locked systems. Esp useful if you don't have a root password set (yes
there are people out there doing that :).

Patch contributed by Eirik Nygaard <eirikn@kerneled.com>.

Bump revision to 5.19nb1.
2005-09-04 17:49:57 +00:00
hubertf
d88186fc80 Finally update xlockmore to 5.19. Changes:
labeling added to ant and ant3d.  The other day, ant3d made a really
    cool looking fan... that prompted me to add labeling so I could save
    the ones I like.
  configure fix for DragonFly thanks to Joerg Sonnenberger
    <joerg AT britannica.bec.de>
  molecule mode fixes, glPushAttrib calls calls were passing invalid
    values thanks to Brian Paul <brianp AT ra.avid.com>.
  5.18 patch for PAM seems to cause problems in Gentoo linux so
    added a GENTOO ifndef around the problem line.
  Fix for a subversion version of ImageMagick thanks to Jouk Jansen.
  Fix for uninitialized read, thanks to Tom Schmidt.
2005-09-04 17:37:13 +00:00
hubertf
f431e37bc0 Update xlockmore to 5.18. Changes:
toneclock coredump fix for 5.17 version thanks to Jouk Jansen.
  Invalid mode added.  :)  lock the screen if an invalid mode is specified
    "xlock -mode tom" like "xlock -modelist bug,tom"
  errno fix in passwd.c for DragonFly thanks to Joerg Sonnenberger
    <joerg AT britannica.bec.de>.
  PAM fixes for when 1. TTY is not set to DISPLAY xlock can fail, 2. Tidy
    fixes for PAM_BAIL.  Thanks to George D M Ross <gdmr AT inf.ed.ac.uk>.
  Notes from Marcelo Vianna <mfvianna AT centroin.com.br> on morph3d added
    as comments to morph3d.c.
2005-06-07 23:35:15 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
hubertf
840eb7346a Add patch for DragonflyBSD, sent by
Joerg Sonnenberger <joerg@britannica.bec.de> in private mail.

Bump to 5.17nb1.
2005-05-30 23:34:49 +00:00
hubertf
c7f8916d12 x11/xlockmore/cm 2005-05-23 16:29:10 +00:00