Bug 100915

Summary: [PATCH] Mk/bsd.port.mk: export rc.subr script suffix
Product: Ports & Packages Reporter: Matthias Andree <matthias.andree>
Component: Individual Port(s)Assignee: Port Management Team <portmgr>
Status: Closed FIXED    
Severity: Affects Only Me CC: portmgr
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Matthias Andree 2006-07-27 12:00:29 UTC
portmgr - as maintainer for Mk/bsd.port.mk - is Cc'd.

The install-rc-script target in ports/Mk/bsd.port.mk performs this check:

.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))

to determine if it should install USE_RC_SUBR files with or without .sh suffix.

However, the result of this check is of wider interest, as it may be useful to
substitute this in a files/pkg-message.in or similar, as used by the upcoming
2.0.6_1 revision of the security/openvpn port, or to check if the build and
execution environments match, to prevent users from installing newer 6.1
packages on 6.0-RELEASE installs which only results in pain and complaining
about non-working rc.d scripts.

I suggest to export a variable, perhaps RC_SUBR_SUFFIX, that a port's Makefile
can query after including bsd.port.pre.mk that is either empty or ".sh".

Suggested patch attached, which also simplifies the install-rc-script target.

I am sending the patch as context diff, because it is easier to review this way
than unified format could be. Please review and apply. Thank you!

Fix: WARNING - This is untested!
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-07-27 12:00:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->portmgr

bsd.port.mk is port manager territory
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2007-01-23 19:59:59 UTC
State Changed
From-To: open->analyzed

Accepted for a test build on the cluster.
Comment 3 dfilter service freebsd_committer freebsd_triage 2007-01-31 14:07:33 UTC
pav         2007-01-31 14:07:24 UTC

  FreeBSD ports repository

  Modified files:
    .                    CHANGES Makefile 
    Mk                   bsd.java.mk bsd.port.mk bsd.tcl.mk 
  Log:
  bsd.port.mk
   [1] Remove DEPENDS
   [2] Add a new pkg-plist keyword @stopdaemon
   [3] Provide rc.subr script suffix as RC_SUBR_SUFFIX
   [4] Add USE_CDRTOOLS to abstract dependency on sysutils/cdrtool[-cjk]
   [5] Add DOS2UNIX_REGEX, allowing to pass a filename regex to CRLF replacement
       routine
   [6] Support partially translated manpages in MAN* variables
   [7] Fix USE_LDCONFIG on ports with @cwd in pkg-plist
   [8] Remove support for XFree86 3.X
   [9] Add user settable WITH_DEBUG flag that turns on -g in CFLAGS and resets
       STRIP
   [9] Fix `make install' to refuse overwriting of older version of the port
  [10] New category ports-mgmt
  [11] New category gnustep
  [12] Removed category picobsd
  
  bsd.java.mk
  [13] Remove deprecated syntax
  
  bsd.tcl.mk
  [14] Provide TCL_VER when USE_TK[_BUILD] is defined. Fixes cad/netgen
  
  ports/Makefile
  [15] Make csup default `make update' method on FreeBSD 6.2 and up
  
  PR:             ports/99742 [1], ports/93373 [2], ports/100915 [3],
                  ports/105161 [4], ports/106029 [5], ports/106252 [6],
                  ports/106235 [7], ports/100939 [9], ports/97507 [10],
                  ports/103931 [11], ports/106921 [12], ports/104136 [13],
                  ports/105215 [15]
  Submitted by:   sem [1] [2], Matthias Andree <matthias.andree@gmx.de> [3],
                  nork [4], pav [5] [7] [14], Nick Barkas <snb@threerings.net> [6],
                  flz [8], gabor [9], shaun [10], erwin [12], hq [13],
                  Gurkan Sengun <gurkan@linuks.mine.nu> [11]
  
  Revision  Changes    Path
  1.65      +40 -2     ports/CHANGES
  1.97      +4 -0      ports/Makefile
  1.75      +9 -59     ports/Mk/bsd.java.mk
  1.547     +108 -120  ports/Mk/bsd.port.mk
  1.6       +2 -1      ports/Mk/bsd.tcl.mk
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Pav Lucistnik freebsd_committer freebsd_triage 2007-01-31 16:13:12 UTC
State Changed
From-To: analyzed->closed

Committed, thanks!