From 0691c69586de76a0cdd888e320fafbaca53c664c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 22 Apr 2012 11:41:55 +0000 Subject: [PATCH] Use RCDIR instead of /etc/rc.d when refering to packages rc scripts. discussed with espie and sthen ok sthen@ --- databases/pgbouncer/Makefile | 3 ++- databases/pgbouncer/pkg/README | 4 ++-- databases/postgresql/Makefile | 4 ++-- databases/postgresql/pkg/README-server | 6 +++--- devel/jenkins/Makefile | 4 ++-- devel/jenkins/pkg/README | 4 ++-- lang/railo/Makefile | 4 ++-- lang/railo/pkg/README | 4 ++-- mail/p5-Mail-SpamAssassin/Makefile | 4 ++-- mail/p5-Mail-SpamAssassin/pkg/README | 4 ++-- net/bitlbee/Makefile | 3 ++- net/bitlbee/pkg/README | 4 ++-- net/nfsen/Makefile | 4 ++-- net/nfsen/pkg/README-main | 4 ++-- net/ntp/Makefile | 3 ++- net/ntp/pkg/README | 4 ++-- net/prosody/Makefile | 4 ++-- net/prosody/pkg/README | 4 ++-- print/cups/Makefile | 4 ++-- print/cups/pkg/README | 4 ++-- productivity/tryton/trytond/Makefile | 3 ++- productivity/tryton/trytond/pkg/README | 4 ++-- telephony/asterisk-g729/Makefile | 4 ++-- telephony/asterisk-g729/pkg/README | 4 ++-- www/trac/Makefile | 4 ++-- www/trac/pkg/README | 4 ++-- www/webacula/Makefile | 4 ++-- www/webacula/pkg/README | 4 ++-- 28 files changed, 57 insertions(+), 53 deletions(-) diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index 3b0f81054ae..cc45b9ec84c 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2012/01/17 13:57:24 pea Exp $ +# $OpenBSD: Makefile,v 1.16 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT = lightweight connection pooler for PostgreSQL DISTNAME = pgbouncer-1.5 +REVISION = 0 CATEGORIES = databases diff --git a/databases/pgbouncer/pkg/README b/databases/pgbouncer/pkg/README index 6e685a1627c..e22f3c65980 100644 --- a/databases/pgbouncer/pkg/README +++ b/databases/pgbouncer/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.4 2011/06/02 13:41:38 ajacoutot Exp $ +$OpenBSD: README,v 1.5 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -15,7 +15,7 @@ Post-installation steps # install -d -o _pgbouncer /var/run/pgbouncer # pgbouncer -u _pgbouncer ${SYSCONFDIR}/pgbouncer/pgbouncer.ini -3. Launch pgbouncer with /etc/rc.d/pgbouncer start +3. Launch pgbouncer with ${RCDIR}/pgbouncer start Random hints ============ diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 78294ba2f2c..89ee1192042 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.162 2012/04/12 11:47:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.163 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT-main= PostgreSQL RDBMS (client) COMMENT-server= PostgreSQL RDBMS (server) @@ -6,7 +6,7 @@ COMMENT-docs= PostgreSQL RDBMS documentation COMMENT-contrib=PostgreSQL RDBMS contributions VERSION= 9.1.3 -REVISION-server=0 +REVISION-server=1 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} PKGNAME-server= postgresql-server-${VERSION} diff --git a/databases/postgresql/pkg/README-server b/databases/postgresql/pkg/README-server index 0ceb85b7ee8..e1d1ee57f0a 100644 --- a/databases/postgresql/pkg/README-server +++ b/databases/postgresql/pkg/README-server @@ -1,4 +1,4 @@ -$OpenBSD: README-server,v 1.11 2012/04/12 11:47:05 sthen Exp $ +$OpenBSD: README-server,v 1.12 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -129,7 +129,7 @@ you must adapt these instructions to your setup. # sudo -u _postgresql pg_dumpall -U postgres > /var/postgresql/full.sqldump 2) Shutdown the server: -# /etc/rc.d/postgresql stop +# ${RCDIR}/postgresql stop 3) Upgrade your PostgreSQL package with pkg_add. # pkg_add -ui postgresql-server @@ -151,7 +151,7 @@ Some postgresql.conf settings changed or disappeared in this version. Examine your old file for local changes and apply them to the new version. 7) Start PostgreSQL: -# /etc/rc.d/postgresql start +# ${RCDIR}/postgresql start 8) Restore your data: # sudo -u _postgresql psql -U postgres < /var/postgresql/full.sqldump diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index 4b4e5a85ad2..c26e274abe3 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2011/08/30 17:16:36 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT = continuous integration server VERSION = 1.401 -REVISION = 5 +REVISION = 6 DISTNAME = jenkins PKGNAME = jenkins-${VERSION} DIST_SUBDIR = jenkins-${VERSION} diff --git a/devel/jenkins/pkg/README b/devel/jenkins/pkg/README index a29ba66a1af..a82f3e532ab 100644 --- a/devel/jenkins/pkg/README +++ b/devel/jenkins/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.4 2011/07/08 02:14:58 ajacoutot Exp $ +$OpenBSD: README,v 1.5 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -15,7 +15,7 @@ HTTPS and AJP, since the former is extra overhead on localhost and the latter conflicts with most Java application servers' AJP port. To change any of these options, carefully copy the line -starting daemon_flags= from /etc/rc.d/jenkins into /etc/rc.conf.local +starting daemon_flags= from ${RCDIR}/jenkins into /etc/rc.conf.local and change the daemon_flags to jenkins_flags in addition to any changes to the ports and other options. diff --git a/lang/railo/Makefile b/lang/railo/Makefile index 5625cb3c33d..084e840f1c3 100644 --- a/lang/railo/Makefile +++ b/lang/railo/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2012/04/20 15:08:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= open-source CFML engine V= 3.3.1.000 -REVISION= 0 +REVISION= 1 DISTNAME= railo-$V EXTRACT_SUFX= .war diff --git a/lang/railo/pkg/README b/lang/railo/pkg/README index 724b4fe70ed..571fa394368 100644 --- a/lang/railo/pkg/README +++ b/lang/railo/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.2 2012/04/20 15:08:40 sthen Exp $ +$OpenBSD: README,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -52,7 +52,7 @@ Starting the service and online configuration - Start/restart tomcat: - /etc/rc.d/tomcat restart + ${RCDIR}/tomcat restart - Connect to http://localhost:8080/. If all goes well you should see the default Railo homepage including a couple of samples and links to the diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 27e468a76fe..7328edc0599 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.78 2012/04/16 21:41:07 sthen Exp $ +# $OpenBSD: Makefile,v 1.79 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= mailfilter to identify and mark spam VER= 3.3.2 DISTNAME= Mail-SpamAssassin-${VER} PKGNAME= p5-${DISTNAME:S/-rc/rc/} -REVISION= 4 +REVISION= 5 RULESNAME= Mail-SpamAssassin-rules-${VER}-r1104058.tar.gz CATEGORIES= mail perl5 diff --git a/mail/p5-Mail-SpamAssassin/pkg/README b/mail/p5-Mail-SpamAssassin/pkg/README index 83b6015c97d..2b948557df0 100644 --- a/mail/p5-Mail-SpamAssassin/pkg/README +++ b/mail/p5-Mail-SpamAssassin/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.1 2011/09/21 08:02:07 sthen Exp $ +$OpenBSD: README,v 1.2 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -17,7 +17,7 @@ spamassassin from pkg_scripts as usual in /etc/rc.conf.local: pkg_scripts="${pkg_scripts} spamassassin" -(Use "/etc/rc.d/spamassassin start" to start the daemon right away). +(Use "${RCDIR}/spamassassin start" to start the daemon right away). The final step: put this at the top of your .procmailrc. diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index 266b97cf1f7..0ed7dce58da 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.43 2012/04/09 15:37:52 okan Exp $ +# $OpenBSD: Makefile,v 1.44 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo DISTNAME= bitlbee-3.0.5 CATEGORIES= net +REVISION= 0 HOMEPAGE= http://bitlbee.org/ diff --git a/net/bitlbee/pkg/README b/net/bitlbee/pkg/README index 99c0adb27aa..f26d4ad0253 100644 --- a/net/bitlbee/pkg/README +++ b/net/bitlbee/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.3 2012/04/09 15:37:53 okan Exp $ +$OpenBSD: README,v 1.4 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -10,7 +10,7 @@ To enable bitlbee, add a line such as: to your /etc/inetd.conf and restart inetd: -# /etc/rc.d/inetd reload +# ${RCDIR}/inetd reload If a libpurple flavored bitlbee port was previously used, be aware that "classic" bitlbee cannot support all protocols supported with purple diff --git a/net/nfsen/Makefile b/net/nfsen/Makefile index 5ee1548488a..a9465ccfe69 100644 --- a/net/nfsen/Makefile +++ b/net/nfsen/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.15 2012/03/20 13:57:44 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2012/04/22 11:41:55 ajacoutot Exp $ MULTI_PACKAGES= -main -web COMMENT-main= web-based front end for the nfdump netflow tools COMMENT-web= html/php parts for nfsen V= 1.3.5 -REVISION-main= 6 +REVISION-main= 7 REVISION-web= 2 DISTNAME= nfsen-$V PKGNAME-main= ${DISTNAME} diff --git a/net/nfsen/pkg/README-main b/net/nfsen/pkg/README-main index 733fdb63fe6..2aa5cdea08b 100644 --- a/net/nfsen/pkg/README-main +++ b/net/nfsen/pkg/README-main @@ -1,4 +1,4 @@ -$OpenBSD: README-main,v 1.2 2011/06/02 13:41:40 ajacoutot Exp $ +$OpenBSD: README-main,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -42,7 +42,7 @@ section in the sample ${SYSCONFDIR}/nfsen.conf # sudo -u _nfcapd nftrack -I -d /var/db/nfsen/ports-db/ - restart nfsen -# /etc/rc.d/nfsen reload +# ${RCDIR}/nfsen reload After the next processing interval, PortTracker should generate data and graphs. If you have problems then examine system logs (you diff --git a/net/ntp/Makefile b/net/ntp/Makefile index a63c001d192..80eb19b711d 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2012/04/10 15:06:29 gonzalo Exp $ +# $OpenBSD: Makefile,v 1.55 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= Network Time Protocol reference implementation @@ -9,6 +9,7 @@ COMMENT= Network Time Protocol reference implementation VERSION= 4.2.6p5 DISTNAME= ntp-${VERSION} PKGNAME= ntp-${VERSION:S/p/pl/} +REVISION= 0 CATEGORIES= net MASTER_SITES= http://archive.ntp.org/ntp4/ntp-4.2/ diff --git a/net/ntp/pkg/README b/net/ntp/pkg/README index e2aa84257aa..7b960373c73 100644 --- a/net/ntp/pkg/README +++ b/net/ntp/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.4 2011/07/11 17:43:14 landry Exp $ +$OpenBSD: README,v 1.5 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -13,7 +13,7 @@ Several steps need to be taken to properly configure the NTP daemon. 2. Now xntpd can be started with: - /etc/rc.d/xntpd start + ${RCDIR}/xntpd start Or to start 'xntpd' at every boot, add it to pkg_scripts in /etc/rc.conf.local. diff --git a/net/prosody/Makefile b/net/prosody/Makefile index 734da4e001c..3a3a64ed149 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2012/01/26 10:32:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2012/04/22 11:41:55 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= communications server for Jabber/XMPP written in Lua DISTNAME= prosody-0.8.2 CATEGORIES= net MASTER_SITES= http://prosody.im/downloads/source/ -REVISION= 0 +REVISION= 1 HOMEPAGE= http://prosody.im/ diff --git a/net/prosody/pkg/README b/net/prosody/pkg/README index c448947cc73..b72847de2ed 100644 --- a/net/prosody/pkg/README +++ b/net/prosody/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.4 2012/01/26 10:27:15 sthen Exp $ +$OpenBSD: README,v 1.5 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -19,7 +19,7 @@ Using Prosody in an OpenBSD environment 2) Prosody includes an rc script for starting and stopping. You can start it by running: - # /etc/rc.d/prosody start + # ${RCDIR}/prosody start You can have it start automatically on boot by adding prosody to your pkg_scripts line in /etc/rc.conf.local diff --git a/print/cups/Makefile b/print/cups/Makefile index e78194bf546..1fa5eed1e81 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.124 2012/02/17 07:45:10 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.125 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= Common Unix Printing System VERSION= 1.5.2 DISTNAME= cups-${VERSION}-source PKGNAME= cups-${VERSION} -REVISION= 0 +REVISION= 1 CATEGORIES= print sysutils diff --git a/print/cups/pkg/README b/print/cups/pkg/README index 26d94fae4f8..4c8129981ab 100644 --- a/print/cups/pkg/README +++ b/print/cups/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.14 2012/02/16 22:12:08 ajacoutot Exp $ +$OpenBSD: README,v 1.15 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -62,4 +62,4 @@ If you experience cups-driverd(8) crashes or printing issues after upgrading to a new major release (e.g. from 1.5 to 1.6), it may be necessary to remove the old CUPS cache and restart cups(8): # rm /var/cache/cups/* 2>/dev/null - # /etc/rc.d/cupsd restart + # ${RCDIR}/cupsd restart diff --git a/productivity/tryton/trytond/Makefile b/productivity/tryton/trytond/Makefile index 4dd8668a40d..bb7078af1da 100644 --- a/productivity/tryton/trytond/Makefile +++ b/productivity/tryton/trytond/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2012/03/30 05:49:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2012/04/22 11:41:55 ajacoutot Exp $ MODPY_EGG_VERSION= 2.2.2 COMMENT= server of the Tryton application platform DISTNAME= trytond-${MODPY_EGG_VERSION} +REVISION= 0 CATEGORIES= www diff --git a/productivity/tryton/trytond/pkg/README b/productivity/tryton/trytond/pkg/README index b61d9072c4b..e457b1d09ea 100644 --- a/productivity/tryton/trytond/pkg/README +++ b/productivity/tryton/trytond/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.2 2011/06/22 08:19:12 ajacoutot Exp $ +$OpenBSD: README,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -31,7 +31,7 @@ Make sure to set the 'tryton' DB user password to the value of First start =========== Start the trytond server: - # /etc/rc.d/trytond start + # ${RCDIR}/trytond start Database initialization ----------------------- diff --git a/telephony/asterisk-g729/Makefile b/telephony/asterisk-g729/Makefile index d82a35f5ee1..7837b1d1f76 100644 --- a/telephony/asterisk-g729/Makefile +++ b/telephony/asterisk-g729/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2011/09/16 11:41:40 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= G.729a voice codec for Asterisk DISTNAME= asterisk-g72x-1.1-beta2 -REVISION= 0 +REVISION= 1 PKGNAME= asterisk-g729-1.1beta2 EXTRACT_SUFX= .tar.bz2 CATEGORIES= telephony diff --git a/telephony/asterisk-g729/pkg/README b/telephony/asterisk-g729/pkg/README index b45805ad506..0a9dd9748a3 100644 --- a/telephony/asterisk-g729/pkg/README +++ b/telephony/asterisk-g729/pkg/README @@ -1,11 +1,11 @@ -$OpenBSD: README,v 1.1.1.1 2011/06/04 17:14:58 jolan Exp $ +$OpenBSD: README,v 1.2 2012/04/22 11:41:55 ajacoutot Exp $ G.729 codec for the Asterisk open source PBX. After installing this package, you will need to either restart Asterisk or manually load the module: -$ sudo /etc/rc.d/asterisk restart +$ sudo ${RCDIR}/asterisk restart $ asterisk -rx 'module load codec_g729.so' You can verify the module has been loaded using the following command: diff --git a/www/trac/Makefile b/www/trac/Makefile index 589c6ab05e5..907a8c7aeb9 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.37 2012/03/03 11:42:06 sthen Exp $ +# $OpenBSD: Makefile,v 1.38 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= wiki and bug tracking system for software projects MODPY_EGG_VERSION=0.12.3 -REVISION= 0 +REVISION= 1 DISTNAME= Trac-${MODPY_EGG_VERSION} PKGNAME= trac-${MODPY_EGG_VERSION} CATEGORIES= www devel diff --git a/www/trac/pkg/README b/www/trac/pkg/README index a5dc34ac636..4b56bd3bf91 100644 --- a/www/trac/pkg/README +++ b/www/trac/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.2 2012/03/03 11:42:06 sthen Exp $ +$OpenBSD: README,v 1.3 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -26,7 +26,7 @@ tracd_flags="-p 8085 " And start the daemon: -# /etc/rc.d/tracd start +# ${RCDIR}/tracd start Now you can open up a web brower and go to http://localhost:8085/. You should see a single link for the project you just created. If you follow diff --git a/www/webacula/Makefile b/www/webacula/Makefile index f186abefb3e..71b6c73793e 100644 --- a/www/webacula/Makefile +++ b/www/webacula/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2012/03/28 07:47:47 sthen Exp $ +# $OpenBSD: Makefile,v 1.20 2012/04/22 11:41:55 ajacoutot Exp $ COMMENT= bacula(8) web interface DISTNAME= webacula-5.5.1 -REVISION= 0 +REVISION= 1 CATEGORIES= www sysutils diff --git a/www/webacula/pkg/README b/www/webacula/pkg/README index 2544c439bdf..e60cad25244 100644 --- a/www/webacula/pkg/README +++ b/www/webacula/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.7 2012/03/28 07:47:47 sthen Exp $ +$OpenBSD: README,v 1.8 2012/04/22 11:41:55 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -94,4 +94,4 @@ Messages { } Then reload bacula-dir(8): - # /etc/rc.d/bacula_dir reload + # ${RCDIR}/bacula_dir reload