UPDATE: sysutils/conky
Hi,
This diff updates conky to the latest release 1.9.0.
Tested on amd64.
Comments ? OK ?
Cheers,
benoit
Index: Makefile
===
RCS file: /cvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile13 Apr 2012 21:21:10 - 1.30
+++ Makefile6 May 2012 07:02:57 -
@@ -4,8 +4,7 @@
COMMENT= light-weight system monitor
-DISTNAME= conky-1.8.1
-REVISION= 8
+DISTNAME= conky-1.9.0
CATEGORIES=sysutils
HOMEPAGE= http://conky.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/conky/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo27 Apr 2011 12:55:10 - 1.6
+++ distinfo6 May 2012 07:02:57 -
@@ -1,5 +1,5 @@
-MD5 (conky-1.8.1.tar.gz) = mzMPfQAcvZ+Bjkhd78GQKQ==
-RMD160 (conky-1.8.1.tar.gz) = 7OQw+Jy0uF9mr244Ylam2KHN628=
-SHA1 (conky-1.8.1.tar.gz) = Brvpt+7YYD+nqXGyfFxh84QkrG8=
-SHA256 (conky-1.8.1.tar.gz) = x5aGmd6zkP4ru9TiujEo/BOrIu5QP5Uj5JRjwDlzyq0=
-SIZE (conky-1.8.1.tar.gz) = 775162
+MD5 (conky-1.9.0.tar.gz) = HI5xWieE1NeZ9fwCE+dtDw==
+RMD160 (conky-1.9.0.tar.gz) = 7Q6cK+plbE6aeCl1BpnjL1i97gY=
+SHA1 (conky-1.9.0.tar.gz) = qNJtACNwybh3rnetOju9JWazjl0=
+SHA256 (conky-1.9.0.tar.gz) = HedU13smcfaHlf25/FBjKKFmjdbKAJhMP0l5CmbTaMo=
+SIZE (conky-1.9.0.tar.gz) = 800797
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/conky/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 27 Apr 2011 12:55:10 - 1.3
+++ patches/patch-configure 6 May 2012 07:02:57 -
@@ -1,11 +1,11 @@
-$OpenBSD: patch-configure,v 1.3 2011/04/27 12:55:10 dcoppa Exp $
configure.orig Tue Aug 25 00:01:58 2009
-+++ configure Tue Apr 27 19:50:09 2010
-@@ -11657,7 +11657,7 @@ $as_echo "#define APCUPSD 1" >>confdefs.h
+$OpenBSD$
+--- configure.orig Thu May 3 23:47:40 2012
configure Sun May 6 08:41:20 2012
+@@ -12537,7 +12537,7 @@
fi
fi
-- if test x$want_apcupsd = xyes; then
+- if test "x$want_apcupsd" = xyes; then
+ if test x"$want_apcupsd" = xyes; then
BUILD_APCUPSD_TRUE=
BUILD_APCUPSD_FALSE='#'
Index: patches/patch-src_ccurl_thread_c
===
RCS file: patches/patch-src_ccurl_thread_c
diff -N patches/patch-src_ccurl_thread_c
--- patches/patch-src_ccurl_thread_c5 Jul 2011 08:18:30 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_ccurl_thread_c,v 1.1 2011/07/05 08:18:30 jasper Exp $
src/ccurl_thread.c.origTue Jul 5 09:35:29 2011
-+++ src/ccurl_thread.c Tue Jul 5 09:35:34 2011
-@@ -33,7 +33,6 @@
- #endif /* DEBUG */
-
- #include
--#include
- #include
-
- /*
Index: patches/patch-src_core_c
===
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_core_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_core_c
--- patches/patch-src_core_c13 Apr 2012 21:21:10 - 1.3
+++ patches/patch-src_core_c6 May 2012 07:02:57 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_core_c,v 1.3 2012/04/13 21:21:10 pascal Exp $
src/core.c.origTue Oct 5 17:29:36 2010
-+++ src/core.c Wed Apr 4 17:48:06 2012
-@@ -170,9 +170,9 @@ struct text_object *construct_text_object(const char *
+$OpenBSD$
+--- src/core.c.origThu May 3 23:08:27 2012
src/core.c Sun May 6 08:21:05 2012
+@@ -170,9 +170,9 @@
#else
NORM_ERR("acpiacadapter: arg is only used on linux");
#endif
@@ -13,7 +13,7 @@
get_cpu_count();
if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 ||
atoi(&arg[0]) == 0
|| atoi(&arg[0]) > info.cpu_count) {
-@@ -326,7 +326,7 @@ struct text_object *construct_text_object(const char *
+@@ -326,7 +326,7 @@
obj->data.i = PB_BATT_STATUS;
}
#endif /* __linux__ */
@@ -22,18 +22,7 @@
END OBJ_IF_ARG(if_up, 0, "if_up needs an argument")
parse_if_up_arg(obj, arg);
#endif
-@@ -541,8 +541,10 @@ struct text_object *construct_text_object(const char *
- parse_platform_sensor(obj, arg);
- END OBJ_ARG(hwmon, 0, "hwmon needs argumanets")
- parse_hwmon_sensor(obj, arg);
-+#endif
- END OBJ(addr, &update_net_stats)
- parse_net_stat_arg(obj, arg, free_at_crash);
-+#ifdef __linux__
- END OBJ(addrs, &update_net_stats)
- parse_net_stat_arg(obj, arg, free_at_crash);
- #endif /* __linux__ */
-@@ -860,7 +862,7 @@ struct text_object *construct_text_object(const char *
+@@ -860,7 +860,7 @@
END OBJ(gw_ip, &update_gateway_info)
#endif /* !__linux__ */
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
@
Re: DEBUG does not disable stripping in some ports
On 2012/05/05 18:23, Antoine Jacoutot wrote: > On Sat, May 05, 2012 at 06:16:59PM +0200, Tobias Ulmer wrote: > > > For building ports you're supposed to use > > > SUDO=/usr/bin/sudo -E > > > in /etc/mk.conf > > > > > > I guess the documentation should be made aware of that... Is using -E > > > helping in your case? > > > > Interesting. > > > > Indeed it does fix my problem. But that seems like a hack because > > sudoers lists all these "unnecessary" ports variables. > > Yes because at first people tried to add missing variables but it became > unmaintainable in the long run because there are just too many with some > being removed/added. I haven't tested yet but I think tobiasu's diff may fix it so we don't need to list all the vars in sudoers or use sudo -E any more. If it's not enough then it should just be a case of looking for more sudo calls and changing them the same way i.e. usng env(1) to get the vars past sudo.
Re: [Maintainer Update] www/mediawiki
On 2012/05/06 08:48, wen heping wrote:
> 2012/5/5 Stuart Henderson
>
> > On 2012/05/05 09:31, wen heping wrote:
> > > Please use this diff(mediawiki-1.19.0-2.diff.txt).which include:
> > >1) update to 1.19.0
> > >2) use README instead of MESSAGE
> >
> > you need this or something like it at the bottom of PLIST:
> >
> > @cwd ${LOCALBASE}/share/doc/pkg-readmes
> > ${FULLPKGNAME}
> >
>
> Thanks.
>
> But where can I find document about it? it seems not documented in OpenBSD
> porter's guide.
>
> wen
pkg_create(1) tells you about @cwd, which you need if you're installing any
files outside of PREFIX. I'm not sure if docs abbout README made it into the
porter's guide yet, but it's in common enough usage that there are lots of
examples in the tree.
Re: DEBUG does not disable stripping in some ports
On Sun, May 06, 2012 at 09:11:01AM +0100, Stuart Henderson wrote: > On 2012/05/05 18:23, Antoine Jacoutot wrote: > > On Sat, May 05, 2012 at 06:16:59PM +0200, Tobias Ulmer wrote: > > > > For building ports you're supposed to use > > > > SUDO=/usr/bin/sudo -E > > > > in /etc/mk.conf > > > > > > > > I guess the documentation should be made aware of that... Is using -E > > > > helping in your case? > > > > > > Interesting. > > > > > > Indeed it does fix my problem. But that seems like a hack because > > > sudoers lists all these "unnecessary" ports variables. > > > > Yes because at first people tried to add missing variables but it became > > unmaintainable in the long run because there are just too many with some > > being removed/added. > > I haven't tested yet but I think tobiasu's diff may fix it so we don't need > to list all the vars in sudoers or use sudo -E any more. If it's not enough > then > it should just be a case of looking for more sudo calls and changing them the > same way i.e. usng env(1) to get the vars past sudo. If that works, I'm all for it and removing the insane amount of ports related env_keep in sudoers(5). -- Antoine
Re: [UPDATE] cmake-2.8.8 rev2 (important)
Il giorno 04/mag/2012 12:02, "Landry Breuil" ha scritto: > Seems to only break devel/llvm in a bulk build So, ok for this to go in? (llvm is now fixed) Ciao Dav
Re: UPDATE: sysutils/cfengine 2.2.10 -> 3.3.0
Hi, >> ...and slightly more updated patch. There are some more things that >> can happen to this port, namely staticlly linking, but I've found the >> configure script unhappy; instead of messing around with that now, I'd >> like to move forward and put this in, then work on the above, plus >> possibly subpackaging it (though I'm leaning towards not anymore) and >> maybe doing a split install. >> >> Previous MAINTAINER has been OK with moving forward for quite some time >> now :) >> >> Feedback, comments, OKs? > > I'm running it in production without problems (amd64), so I'm ok, but I'm > not a developer. It would be great if this could get committed. Maybe I was a little bit too early with saying "without problems". Cf-serverd hangs will checking the policy after the local configuration has changed. It hangs on the following line (from cf-serverd -v): Checking policy with command ""/var/cfengine/bin/cf-promises" -f "/var/cfengine/inputs/promises.cf"" Any suggestions? Kind regards, Martijn Rijkeboer
טיפול מוצלח לפטרת ציפורניים
פתרון ייחודי לחיסול פטרת הציפורניים! הצלחה מוכחת בקרב אלפי מטופלים לחצ/י כאן טיפול חיצוני ולא פולשני. ללא כדורים וחומרים מזיקים לגוף. ללא עקירה, המסה או נזק לציפורן. לפרטים נוספים לחצ/י כאן דואר זה נשלח ע"י ישראפרי - ניוזלטר הצעות ללא תשלום החוסך לך כסף. נא לא לענות למייל זה. הוא אינו נקרא. להסרה מרשימת התפוצה אנא לחצ/י כאן [IMAGE]
[Patch]www/vtigercrm
Hi,
Here is an patch for www/vtigercrm which include:
1) update to 5.4.0
2) modify LICENSE
3) I would maintain it
It work well on my i386.
OK? Comments?
wen
? vtiger-5.4.0.diff.txt
Index: Makefile
===
RCS file: /cvs/ports/www/vtigercrm/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile16 Nov 2011 15:56:38 - 1.12
+++ Makefile6 May 2012 15:05:04 -
@@ -2,15 +2,15 @@
COMMENT= customer relationship management (CRM) software
-DISTNAME= vtigercrm-5.3.0
+DISTNAME= vtigercrm-5.4.0
CATEGORIES=www
-REVISION= 0
-
HOMEPAGE= http://www.vtiger.com/crmproducts/vtiger-crm-open-source
-# GPLv2 - LGPLv2 - BSD
-# SugarCRM Public License (SPL) 1.1.2
+MAINTAINER=Wen Heping
+
+# Mozilla Public License Version 1.1
+# vtiger Public License Version 1.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -34,6 +34,6 @@
do-install:
cp -Rp ${WRKSRC} ${PREFIX}
- chown -R ${BINOWN}:${BINGRP} ${INSTDIR}
+ chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
.include
Index: distinfo
===
RCS file: /cvs/ports/www/vtigercrm/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo12 Nov 2011 13:22:29 - 1.5
+++ distinfo6 May 2012 15:05:04 -
@@ -1,5 +1,5 @@
-MD5 (vtigercrm-5.3.0.tar.gz) = hu+d3NAyVp4+KBmxG9D2cg==
-RMD160 (vtigercrm-5.3.0.tar.gz) = S7GaL7vnC/GBSxhwJHW7PPc6QQA=
-SHA1 (vtigercrm-5.3.0.tar.gz) = YvXgqu27s+E6TGa6fdq+Mz+IIt4=
-SHA256 (vtigercrm-5.3.0.tar.gz) = C0rO8cldbmsMKowfTsQMw/2z/4C8jl4xoAJQomiVG5k=
-SIZE (vtigercrm-5.3.0.tar.gz) = 30284788
+MD5 (vtigercrm-5.4.0.tar.gz) = TZ+wR8QqgjG8u62cXjEpLg==
+RMD160 (vtigercrm-5.4.0.tar.gz) = 2AvU4/YFQupary/ZrSQZEy5Vn2k=
+SHA1 (vtigercrm-5.4.0.tar.gz) = J/Z+59EZW4ZOGPdks9dNmFVElEY=
+SHA256 (vtigercrm-5.4.0.tar.gz) = dUEXJVWYOXlHYzpBojJzMypSahaZaRr4HbLy9R8Jy68=
+SIZE (vtigercrm-5.4.0.tar.gz) = 31491609
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/vtigercrm/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 16 Nov 2011 22:40:41 - 1.7
+++ pkg/PLIST 6 May 2012 15:05:22 -
@@ -316,6 +316,7 @@
vtigercrm/Smarty/templates/GroupEditView.tpl
vtigercrm/Smarty/templates/Header.tpl
vtigercrm/Smarty/templates/Home/
+vtigercrm/Smarty/templates/Home/FirstTimeLogin.tpl
vtigercrm/Smarty/templates/Home/HomeBlock.tpl
vtigercrm/Smarty/templates/Home/HomeButtons.tpl
vtigercrm/Smarty/templates/Home/HomeWidgetURL.tpl
@@ -379,6 +380,7 @@
vtigercrm/Smarty/templates/ReportColumns.tpl
vtigercrm/Smarty/templates/ReportColumnsTotal.tpl
vtigercrm/Smarty/templates/ReportContents.tpl
+vtigercrm/Smarty/templates/ReportDashbord.tpl
vtigercrm/Smarty/templates/ReportFilters.tpl
vtigercrm/Smarty/templates/ReportGrouping.tpl
vtigercrm/Smarty/templates/ReportRun.tpl
@@ -397,6 +399,7 @@
vtigercrm/Smarty/templates/Rss.tpl
vtigercrm/Smarty/templates/RssFeeds.tpl
vtigercrm/Smarty/templates/SelectEmail.tpl
+vtigercrm/Smarty/templates/SentMailFolders.tpl
vtigercrm/Smarty/templates/SetMenu.tpl
vtigercrm/Smarty/templates/Settings/
vtigercrm/Smarty/templates/Settings.tpl
@@ -418,6 +421,8 @@
vtigercrm/Smarty/templates/Settings/InventoryTerms.tpl
vtigercrm/Smarty/templates/Settings/LayoutBlockEntries.tpl
vtigercrm/Smarty/templates/Settings/LayoutBlockList.tpl
+vtigercrm/Smarty/templates/Settings/MenuEditor.tpl
+vtigercrm/Smarty/templates/Settings/MenuEditorAssign.tpl
vtigercrm/Smarty/templates/Settings/ModifyPickList.tpl
vtigercrm/Smarty/templates/Settings/ModuleManager/
vtigercrm/Smarty/templates/Settings/ModuleManager/ModuleImportStep1.tpl
@@ -428,8 +433,6 @@
vtigercrm/Smarty/templates/Settings/ModuleManager/ModuleUpdateStep1.tpl
vtigercrm/Smarty/templates/Settings/ModuleManager/ModuleUpdateStep2.tpl
vtigercrm/Smarty/templates/Settings/ModuleManager/ModuleUpdateStep3.tpl
-vtigercrm/Smarty/templates/Settings/ModuleOwners.tpl
-vtigercrm/Smarty/templates/Settings/ModuleOwnersContents.tpl
vtigercrm/Smarty/templates/Settings/OrderRelatedList.tpl
vtigercrm/Smarty/templates/Settings/ProxyServer.tpl
vtigercrm/Smarty/templates/Settings/TaxConfig.tpl
@@ -485,6 +488,7 @@
vtigercrm/Smarty/templates/modules/Bookmarklet/Bookmarklet.tpl
vtigercrm/Smarty/templates/modules/Calendar/
vtigercrm/Smarty/templates/modules/Leads/
+vtigercrm/Smarty/templates/modules/Leads/ConvertLead.tpl
vtigercrm/Smarty/templates/modules/Leads/LeadsCustomEntries.tpl
vtigercrm/Smarty/templates/modules/PickList/
vtigercrm/Smarty/templates/modules/PickList/AddPickList.tpl
@@ -686,12 +690,10 @@
vtigercrm/copyright.html
vtigercrm/cron/
vtigercrm/cron/MailScanner.service
-vtigercrm/cron/MailScannerCron.bat
-vtigercrm/cron/MailScannerCron.sh
vtigercrm/cron/README-NewCronServiceSetup.txt
+vtigercrm/cron/SendReminder.service
v
Re: UPDATE: sysutils/cfengine 2.2.10 -> 3.3.0
On Sun, May 06, 2012 at 02:29:10PM +0200, Martijn Rijkeboer wrote: > Maybe I was a little bit too early with saying "without problems". > Cf-serverd hangs will checking the policy after the local configuration > has changed. > > It hangs on the following line (from cf-serverd -v): > Checking policy with command ""/var/cfengine/bin/cf-promises" -f > "/var/cfengine/inputs/promises.cf"" Does /var/cfengine/bin/cf-promises exist? jirib
new: devel/hs-split and devel/hs-cmdlib
Here are two new ports that are needed for an update of devel/darcs while keeping the darcs test cases running (some more new ports will follow): - devel/hs-split: Provides a wide range of strategies and a unified combinator framework for splitting lists with respect to some sort of delimiter. http://hackage.haskell.org/package/split Required by devel/hs-cmdlib - devel/hs-cmdlib: A commandline parsing library, based on getopt. Comes with a powerful attribute system. Supports complex interfaces with many options and commands, with option & command grouping, with simple and convenient API. Even though quite powerful, it strives to keep simple things simple. The library uses "System.Console.GetOpt" as its backend. In comparison to the other commandline handling libraries: Compared to cmdargs, cmdlib has a pure attribute system and is based on GetOpt for help formatting & argument parsing. Cmdlib may also be more extendable due to typeclass design, and can use user-supplied types for option arguments. Cmdargs >= 0.4 can optionally use a pure attribute system, although this is clearly an add-on and the API is a second-class citizen in relation to the impure version. GetOpt and parseargs both require explicit flag representation, so they live a level below cmdlib. GetOpt is in fact used as a backend by cmdlib. http://hackage.haskell.org/package/cmdlib Required for devel/darcs tests Ok to import? Ciao, Kili hs-split.tgz Description: application/tar-gz hs-cmdlib.tgz Description: application/tar-gz
new: devel/hs-strict and devel/hs-shellish
The next two ports required by the darcs update: - devel/hs-strict: Provides strict versions of some standard Haskell data types (pairs, Maybe and Either). Also contains strict IO operations. http://www.cse.unsw.edu.au/~rl/code/strict.html Required by devel/hs-shellish - devel/hs-shellish: The shellisg package provides a single module for convenient "systems" programming in Haskell, similar in spirit to POSIX shells or PERL. * Elegance and safety is sacrificed for conciseness and swiss-army-knife-ness. * The interface exported by Shellish is thread-safe. Overall, the module should help you to get a job done quickly, without getting too dirty. http://hackage.haskell.org/package/shellish Required by the devel/darcs tests Ok to import? Ciao, Kili hs-strict.tgz Description: application/tar-gz hs-shellish.tgz Description: application/tar-gz
new: devel/hs-ansi-wl-pprint
And another one (needed for hs-test-framework, which will be used by the devel/darcs tests)... - hs-ansi-wl-pprint: Pretty printing library based on Wadler's paper "A Prettier Printer". It has been enhanced with support for ANSI terminal colored output using the ansi-terminal package. http://batterseapower.github.com/ansi-wl-pprint/ Ok to import? Ciao, Kili hs-ansi-wl-pprint.tgz Description: application/tar-gz
new: net/hs-hostname
Yet another (rather silly) one, needed by devel/hs-testframework: - hs-hostname: Very simple package providing a cross-platform means of determining the hostname. http://hackage.haskell.org/package/hostname Ok to import? Ciao, Kili hs-hostname.tgz Description: application/tar-gz
new: devel/hs-test-framework{,-hunit,-quickcheck2}
Finally, hs-test-framework and interfaces to HUnit and Quickcheck. This all is used by the tests of darcs-2.8.0. - hs-test-framework: Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in parallel (but reported in deterministic order, to aid diff interpretation) and filtered and controlled by command line options. All of this comes with colored test output, progress reporting and test statistics output. http://batterseapower.github.com/test-framework/ Required by devel/hs-test-framework-hunit and devel/hs-test-framework-quickcheck2 - hs-test-framework-hunit: Allows HUnit test cases to be used with the test-framework package. - hs-test-framework-quickcheck2: Allows QuickCheck2 properties to be used with the test-framework package. Ok to import? Ciao, Kili hs-test-framework.tgz Description: application/tar-gz hs-test-framework-hunit.tgz Description: application/tar-gz hs-test-framework-quickcheck2.tgz Description: application/tar-gz
Re: UPDATE: sysutils/cfengine 2.2.10 -> 3.3.0
>> Maybe I was a little bit too early with saying "without problems". >> Cf-serverd hangs will checking the policy after the local configuration >> has changed. >> >> It hangs on the following line (from cf-serverd -v): >> Checking policy with command ""/var/cfengine/bin/cf-promises" -f >> "/var/cfengine/inputs/promises.cf"" > > Does /var/cfengine/bin/cf-promises exist? Yes and if I run it from the command line it works fine. Kind regards, Martijn Rijkeboer
(AD)票`13916 123 268发v代`~开 `~
Your friend 寄了一則文�� 給�� 喔!! 給您的留言： g （代） （开 q （发~~ (AD)票~ `验 `后 `付` 款a h6y3ud4n `联 系 人：李`经 理 139 16123 268 @ 139. c o m k (AD)票`13916 123 268发v代`~开 `~ http://tw.myblog.yahoo.com/jw!1K84p1yREQXRDO9YOXH0EfAuoaYkEjm18Q--/article?mid=1 Yahoo!奇摩時尚 �� 的時尚.品味.生活新體驗。 http://tw.fashion.yahoo.com/ 版權所有 Yahoo!奇摩
update: devel/darcs
Update to darcs-2.8.0.
For a list of changes, please read the announcement email:
http://lists.osuosl.org/pipermail/darcs-users/2012-April/026493.html
Changes of the port itself:
- Use the threaded GHC runtime (yes, this may cause darcs to exit
immediately after startup, but it's required for running the
tests, and nobody else seems to build it with the non-threaded
GHC runtime).
- Don't use groff. mandoc works just fine.
- Add some GNU tools to REGRESS_DEPENDS and install proper symlinks for
running the tests.
This needs the following new ports I just sent a few minutes ago:
devel/hs-split
devel/hs-cmdlib
devel/hs-strict
devel/hs-shellish
devel/hs-ansi-wl-pprint
net/hs-hostname
devel/hs-test-framework
devel/hs-test-framework-hunit
devel/hs-test-framework-quickcheck2
If you run make regress on it, please note that two cases (ask_deps
and issue121) will fail. I don't see any reason to panic because
this ;-)
I've tested this successfully on amd64. Tests on i386 would be nice.
If you use darcs frequently, please give this a try.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile31 Dec 2011 22:30:49 - 1.44
+++ Makefile6 May 2012 17:06:20 -
@@ -2,8 +2,7 @@
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.5.2
-REVISION = 5
+DISTNAME = darcs-2.8.0
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -11,30 +10,45 @@ HOMEPAGE = http://www.darcs.net/
WANTLIB = c curl>=2 gmp m ncursesw pthread util z
MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f '-library -threaded'
+MODGHC_SETUP_CONF_ARGS =-f '-library test'
LIB_DEPENDS = devel/gmp \
net/curl
# Yes, build dependencies, because GHC libs are still static and we
# don't want to pull in all of ghc.
-BUILD_DEPENDS =hs-tar->=0.3,<0.4:devel/hs-tar \
- hs-zlib->=0.5.0,<0.6.0:archivers/hs-zlib \
- hs-hashed-storage->=0.5.2,<0.6:devel/hs-hashed-storage \
- hs-haskeline->=0.6.2.2,<0.7:devel/hs-haskeline \
- hs-mtl->=1.0,<2.1:devel/hs-mtl \
- hs-parsec->=2.0,<3.2:devel/hs-parsec \
- hs-regex-compat->=0.71,<0.96:devel/hs-regex-compat \
- hs-text->=0.3:devel/hs-text \
- hs-html->=1.0,<1.1:www/hs-html \
- ${RUN_DEPENDS} \
- textproc/latex2html
+BUILD_DEPENDS =archivers/hs-zlib>=0.5.1.0,<0.6.0.0 \
+ devel/hs-tar>=0.3,<0.4 \
+ devel/hs-hashed-storage>=0.5.6,<0.6 \
+ devel/hs-haskeline>=0.6.3,<0.7 \
+ devel/hs-mmap>=0.5,<0.6 \
+ devel/hs-mtl>=1.0,<2.1 \
+ devel/hs-network>=2.2,<2.4 \
+ devel/hs-parsec>=2.0,<3.2 \
+ devel/hs-regex-compat=0.95.1 \
+ devel/hs-terminfo>=0.3,<0.4 \
+ devel/hs-text>=0.11.0.6,<0.12.0.0 \
+ devel/hs-vector>=0.7 \
+ www/hs-html>=1.0,<1.1 \
+ textproc/latex2html \
+ ${RUN_DEPENDS}
+
+# Used for building the test suite (which is done during normal
+# build time, not during regress time).
+BUILD_DEPENDS += devel/hs-QuickCheck>=2.3 \
+ devel/hs-HUnit>=1.0 \
+ devel/hs-cmdlib>=0.2.1,<0.4 \
+ devel/hs-shellish>=0.1.3,<0.2 \
+ devel/hs-test-framework>=0.4.0 \
+ devel/hs-test-framework-hunit>=0.2.2 \
+ devel/hs-test-framework-quickcheck2>=0.2.8
REGRESS_DEPENDS = devel/hs-hlint \
- shells/bash
+ shells/bash \
+ sysutils/coreutils \
+ textproc/gsed
# For the documentation
USE_GMAKE =Yes
-USE_GROFF =Yes
PORTHOME = ${WRKDIR}
post-build:
@@ -47,6 +61,11 @@ post-install:
rm -rf ${PREFIX}/share/man
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKBUILD}/dist/build/darcs/darcs.1 ${PREFIX}/man/man1
+
+# Some of the tests rely on GNU functionality.
+pre-regress:
+ ln -fs ${LOCALBASE}/bin/gdate ${WRKDIR}/bin/date
+ ln -fs ${LOCALBASE}/bin/gsed ${WRKDIR}/bin/sed
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.23
diff -u -p -r
Re: [UPDATE] cmake-2.8.8 rev2 (important)
On Sun, May 06, 2012 at 11:10:15AM +0200, David Coppa wrote: > Il giorno 04/mag/2012 12:02, "Landry Breuil" ha > scritto: > > > Seems to only break devel/llvm in a bulk build > > So, ok for this to go in? (llvm is now fixed) ok for me. Landry
Re: NEW: dbus-tcl and dbus-intf
On 03/09/12 03:27, Landry Breuil wrote: > On Fri, Mar 09, 2012 at 12:43:19AM -0500, Stuart Cassoff wrote: >> On 02/28/12 04:35, Stuart Cassoff wrote: >>> dbus-tcl: Tcl bindings for the DBus interprocess messaging system. >>> dbus-intf: High level interface to dbus-tcl. >>> >>> Stu >> >> Hi, any ... um, thoughts on this? > > Looks good, but are you sure the pthread hack is still needed in > dbus-tcl now that we have rthreads ? > ok for tcllib & dbus-intf. > > Landry > Tcl is currently not loving rthreads, or the other way 'round. I'd like to get this in now-ish and then make adjustments later. Stu
UPDATE pgtcl 1.5 -> 1.7
Maintainer timeout (1 week).
Stu
Index: Makefile
===
RCS file: /cvs/ports/databases/pgtcl/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile16 Sep 2011 08:48:03 - 1.8
+++ Makefile1 May 2012 01:27:38 -
@@ -4,11 +4,8 @@ SHARED_ONLY= Yes
COMMENT= Tcl interface to PostgreSQL
-V= 1.5
-DISTNAME= pgtcl$V
-PKGNAME= pgtcl-$V
-REVISION = 3
-SHARED_LIBS= pgtcl 0.0
+DISTNAME= pgtcl-1.7
+SHARED_LIBS= pgtcl17 0.0
CATEGORIES=databases
HOMEPAGE= http://pgfoundry.org/projects/pgtcl/
@@ -21,25 +18,30 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://pgfoundry.org/frs/download.php/338/
+MASTER_SITES= http://pgfoundry.org/frs/download.php/2151/
MODULES= lang/tcl
-MODTCL_VERSION=8.4
LIB_DEPENDS= databases/postgresql
RUN_DEPENDS= ${MODTCL_RUN_DEPENDS}
-BUILD_DEPENDS= ${RUN_DEPENDS}
-WANTLIB += pq>=5
+BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS}
+WANTLIB += pq>=5 tcl85
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
- --with-tclinclude=${MODTCL_INCDIR} \
+ --libdir=${MODTCL_TCLDIR} \
--with-postgres-include=${LOCALBASE}/include/postgresql \
- --with-postgres-lib=${LOCALBASE}/lib
+ --with-postgres-lib=${LOCALBASE}/lib \
+ --disable-threads \
+ SHLIB_VERSION=${LIBpgtcl17_VERSION}
-MAKE_FLAGS=PKG_LIB_FILE=libpgtcl.so.${LIBpgtcl_VERSION}
+FAKE_FLAGS=PKG_DIR=pgtcl INSTALL_LIBRARY='${INSTALL_DATA}' PKG_HEADERS=
NO_REGRESS=Yes
+WRKDIST = ${WRKDIR}/lib${DISTNAME}
+ALL_TARGET =binaries libraries
+INSTALL_TARGET =install-binaries install-libraries
+SEPARATE_BUILD =Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgtcl/html
Index: distinfo
===
RCS file: /cvs/ports/databases/pgtcl/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo13 Oct 2007 08:54:02 - 1.1.1.1
+++ distinfo1 May 2012 01:27:38 -
@@ -1,5 +1,5 @@
-MD5 (pgtcl1.5.tar.gz) = bu0cM4/Du3qER5fJK3m5Ng==
-RMD160 (pgtcl1.5.tar.gz) = 8ZgGbFOKlWb5BE6ImUI+4x4SM0k=
-SHA1 (pgtcl1.5.tar.gz) = jSvlN8EjEAq08abdwRaE/U4MzSM=
-SHA256 (pgtcl1.5.tar.gz) = uu3doB9SED9X4mXrse1ZROiA74F3aQOJefatzOMzhaI=
-SIZE (pgtcl1.5.tar.gz) = 486901
+MD5 (pgtcl-1.7.tar.gz) = 5x7YhtXeX19FW8AhNklESA==
+RMD160 (pgtcl-1.7.tar.gz) = PAbAw0tH2XJBkxVHiGBmxhSv6TE=
+SHA1 (pgtcl-1.7.tar.gz) = WN7R792/EW+8XlFobgugRCk+Y5Q=
+SHA256 (pgtcl-1.7.tar.gz) = COmhSWGxs9mFgpq+VvMHpoOAFzvSEnHMwWtfEu2wsuw=
+SIZE (pgtcl-1.7.tar.gz) = 497868
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 13 Oct 2007 08:54:02 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/10/13 08:54:02 steven Exp $
Makefile.in.orig Mon Jun 13 23:02:03 2005
-+++ Makefile.inSun Sep 16 22:33:09 2007
-@@ -167,7 +167,7 @@ COMPILE= $(CC) $(DEFS) $(INCLUDES)
$(AM_CPPFLAGS) $(
- # for the BINARIES that you specified above have already been done.
- #
-
--all: binaries libraries doc
-+all: binaries libraries
-
- #
- # The binaries target builds executable programs, Windows .dll's, unix
-@@ -186,7 +186,7 @@ doc:
- @echo "xml2nroff sample.xml > sample.n"
- @echo "xml2html sample.xml > sample.html"
-
--install: all install-binaries install-libraries install-doc
-+install: all install-binaries install-libraries
-
- install-binaries: binaries install-lib-binaries install-bin-binaries
-
Index: patches/patch-configure
===
RCS file: /cvs/ports/databases/pgtcl/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 24 Jan 2008 18:34:01 - 1.1
+++ patches/patch-configure 1 May 2012 01:27:38 -
@@ -1,21 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2008/01/24 18:34:01 merdely Exp $
configure.orig Wed Jan 23 21:20:30 2008
-+++ configure Wed Jan 23 21:21:08 2008
-@@ -7376,7 +7376,7 @@ fi
- ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
- TCL_LIB_VERSIONS_OK=ok
- CFLAGS_DEBUG=-g
--CFLAGS_OPTIMIZE=-O
-+#CFLAGS_OPTIMIZE=-O
- if test "$GCC" = "yes" ; then
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
- else
-@@ -10091,7 +10091,7 @@ fi
- ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
- TCL_LIB_VERSIONS_OK=ok
- CFLAGS_DEBUG=-g
--
NEW: Byzi
$ pkg_info byzi Information for inst:byzi-0.1 Comment: confine pointer and keyboard events to a Tk window sub-tree Required by: tkrat-2.1.2p3 Description: The Byzi extension for Tk provides a simple means to block keyboard, button and pointer events from Tk widgets, while overriding the widget's cursor with a configurable busy cursor. The Byzi extension is based on the Tk 8.6 busy command sources. Stu byzi-0.1-port.tar.gz Description: application/gzip
UPDATE: TkRat
- Now works with Tcl/Tk 8.5.
- Needs new port 'Byzi', already submitted.
- Take maintainer with permission.
This is the last of the 8.4-dependent ports! \o/
I've submitted patches for all others either to
this list or to the maintainers.
Also, I could use some ok's for the other stuff I've
submitted recently, thanks.
Stu
Index: Makefile
===
RCS file: /cvs/ports/mail/tkrat/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile5 Jan 2011 17:09:26 - 1.26
+++ Makefile6 May 2012 17:58:48 -
@@ -3,12 +3,12 @@
COMMENT= mail user agent for X in C with a Tcl/Tk frontend
DISTNAME= tkrat-2.1.2
-REVISION = 2
+REVISION = 3
CATEGORIES=mail x11
HOMEPAGE= http://www.tkrat.org/
-MAINTAINER=Kevin Lo
+MAINTAINER=Stuart Cassoff
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
@@ -16,30 +16,33 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= x11/tk
-MODTCL_VERSION=8.4
-MODTK_VERSION= 8.4
-
WANTLIB= crypto ssl
MASTER_SITES= ftp://ftp.tkrat.org/pub/tkrat/
-RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
-BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= ${MODTK_RUN_DEPENDS} x11/byzi
+BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS}
+
+MAKE_FLAGS=BUSYLIB= DUMMYLIB= RATLIB_SUFFIX=.so.2.1 \
+ LIB_DIR=\$${prefix}/lib/tcl/tkrat \
+ DATA_DIR=\$${prefix}/lib/tcl/tkrat/app \
+ SHLIB_LD='cc -shared'
+
+FAKE_FLAGS=UTIL_DIR=\$${prefix}/lib/tcl/tkrat/util
USE_GROFF =Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS=--with-tcl-bin="${LOCALBASE}/bin" \
--with-tcl-include="${MODTCL_INCDIR}" \
- --with-tkconfig="${MODTK_LIBDIR}"
+ --with-tkconfig="${MODTK_LIBDIR}" \
+ --program-transform-name='s/2[.]1//'
NO_REGRESS=Yes
DOCS= CONFIGURATION doc/interface doc/userproc.example doc/userprocs
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/tkrat
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkrat
- ${INSTALL_DATA} ${WRKSRC}/lib/pkgIndex.tcl ${PREFIX}/lib/tkrat
- cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/tkrat
+ ${INSTALL_DATA} ${DOCS:S!^!${WRKSRC}/!} ${PREFIX}/share/doc/tkrat
.include
Index: patches/patch-Makefile.in
===
RCS file: patches/patch-Makefile.in
diff -N patches/patch-Makefile.in
--- patches/patch-Makefile.in 27 Dec 2003 23:34:42 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
Makefile.in.orig 2002-05-29 17:13:29.0 -0400
-+++ Makefile.in2003-12-20 18:39:30.0 -0500
-@@ -25,8 +25,8 @@ build:
- else \
- ${MAKE} ${OSTYPE} ${IMAPFLAGS} EXTRACFLAGS="${EXTRACFLAGS}"; \
- fi
-- cd lib; ${MAKE}
- cd util; ${MAKE}
-+ cd lib; ${MAKE}
- cd tkrat; ${MAKE}
-
- install.bin:
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/mail/tkrat/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 27 Dec 2003 23:34:42 - 1.2
+++ patches/patch-lib_Makefile_in 6 May 2012 17:58:48 -
@@ -1,53 +1,30 @@
lib/Makefile.in.orig 2003-09-23 14:13:37.0 -0400
-+++ lib/Makefile.in2003-12-20 19:17:54.0 -0500
-@@ -25,7 +25,7 @@ EXTRA_CFLAGS = @CFLAGS@ @MEM_DEBUG_FLAGS
-MAN_DIR = @mandir@
-BIN_DIR = @bindir@
- DATA_DIR = @datadir@/`echo tkrat${VERSION} | sed '${TRANSFORM}'`
-- LIB_DIR = @libdir@/`echo tkrat${VERSION} | sed '${TRANSFORM}'`
-+ LIB_DIR = @libdir@/`echo tkrat | sed '${TRANSFORM}'`
-
- # Pointer to the imap c-client directory
- C_CLIENT = ${TOP_DIR}/imap/c-client
-@@ -54,6 +54,7 @@ SHELL = /bin/sh
- SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
- VERSION = @VERSION@
- RATLIB_SUFFIX = @RATLIB_SUFFIX@
-+ BUSYLIB_VERSION = @BUSYLIB_VERSION@
- INSTALL = @INSTALL@
- TCLSH = @tclsh@
- TRANSFORM = @program_transform_name@
-@@ -67,7 +68,8 @@ SHELL = /bin/sh
- CFLAGS = ${TK_DEFS} ${EXTRA_CFLAGS} -I${C_CLIENT} ${FIX_INCLUDE} ${INCLUDES} \
-${SHLIB_CFLAGS} -DVERSION=\"${VERSION}\"
- C_CLIENT_LIB = ${C_CLIENT}/c-client.a
--RATLIB = ratatosk${RATLIB_SUFFIX}
-+RATLIB = ratatosk${SHLIB_SUFFIX}.${VERSION}
-+BUSYLIB = blt_busy${SHLIB_SUFFIX}.${BUSYLIB_VERSION}
- DUMMYLIB = ratDummy${SHLIB_SUFFIX}
-
- HEADERS = rat.h ratFolder.h ratPGP.h ratStdFolder.h
-@@ -90,9 +92,11 @@ ${DUMMYLIB}: ratDummy.o
+$OpenBSD$
+--- lib/Makefile.in.orig Tue Sep 23 14:13:37 2003
lib/Makefile.inFri May 4 17:26:44 2012
+@@ -90,22 +90,15 @@ ${DUMMYLIB}: ratDummy.o
${SHLIB_LD} -o ${DUMMYLIB} ratDummy.o $(EXTRA_LIBS) ${SHLIB_LD_LIBS}
pkgIndex.tcl: ${RATL
Re: UPDATE: TkRat
On 2012/05/06 15:11, Stuart Cassoff wrote:
> - Now works with Tcl/Tk 8.5.
> - Needs new port 'Byzi', already submitted.
> - Take maintainer with permission.
build fails for me:
cp ../util/ . ; echo "if [catch {load ./; load ./ratatosk.so.2.1; load ./;
pkg_mkIndex . ratatosk.so.2.1 } error] {puts \$error; exit 1}" |
/usr/local/bin/tclsh8.5
cp: ../util/ is a directory (not copied).
full log below.
$ make install
===> Enabling ccache for tkrat-2.1.2p3
===> Checking files for tkrat-2.1.2p3
`/data/distfiles/tkrat-2.1.2.tar.gz' is up to date.
>> (SHA256) tkrat-2.1.2.tar.gz: OK
===> tkrat-2.1.2p3 depends on: tk->=8.5,<8.6 -> tk-8.5.11
===> tkrat-2.1.2p3 depends on: tcl->=8.5,<8.6 -> tcl-8.5.11p0
===> tkrat-2.1.2p3 depends on: ccache-* -> ccache-3.1.7
===> tkrat-2.1.2p3 depends on: groff->=1.21 -> groff-1.21p7
===> Verifying specs: crypto ssl crypto ssl
===> found crypto.20.1 ssl.18.0
===> Extracting for tkrat-2.1.2p3
===> Patching for tkrat-2.1.2p3
===> Applying OpenBSD patch patch-Makefile.in
===> Ignoring empty patchfile patch-Makefile.in
===> Ignoring patchfile patch-Makefile.in.orig
===> Applying OpenBSD patch patch-lib_Makefile_in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|--- lib/Makefile.in.orig 2003-09-23 14:13:37.0 -0400
|+++ lib/Makefile.in2003-12-20 19:17:54.0 -0500
--
Patching file lib/Makefile.in using Plan A...
Hunk #1 succeeded at 25.
Hunk #2 succeeded at 54.
Hunk #3 succeeded at 68.
Hunk #4 succeeded at 92.
Hunk #5 succeeded at 107.
done
===> Ignoring patchfile patch-lib_Makefile_in.orig
===> Ignoring patchfile patch-lib_Makefile_in.rej
===> Applying OpenBSD patch patch-lib_ratAddress_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD$
|--- lib/ratAddress.c.orig Fri May 4 17:06:22 2012
|+++ lib/ratAddress.c Fri May 4 17:06:44 2012
--
Patching file lib/ratAddress.c using Plan A...
Hunk #1 succeeded at 1175.
done
===> Ignoring patchfile patch-lib_ratAddress_c.orig
===> Applying OpenBSD patch patch-lib_ratStdMessage_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-lib_ratStdMessage_c,v 1.2 2003/12/27 23:34:42 jose Exp $
|--- lib/ratStdMessage.c.orig Mon Feb 4 15:35:10 2002
|+++ lib/ratStdMessage.cWed May 2 23:41:44 2012
--
Patching file lib/ratStdMessage.c using Plan A...
Hunk #1 succeeded at 435.
done
===> Ignoring patchfile patch-lib_ratStdMessage_c.orig
===> Applying OpenBSD patch patch-misc_Makefile_in
===> Ignoring empty patchfile patch-misc_Makefile_in
===> Ignoring patchfile patch-misc_Makefile_in.orig
===> Applying OpenBSD patch patch-tkrat_Makefile_in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|--- tkrat/Makefile.in.orig Sun Oct 29 08:53:39 2000
|+++ tkrat/Makefile.in Mon Jul 9 20:35:34 2001
--
Patching file tkrat/Makefile.in using Plan A...
Hunk #1 succeeded at 13.
done
===> Ignoring patchfile patch-tkrat_Makefile_in.orig
===> Ignoring patchfile patch-tkrat_Makefile_in.rej
===> Applying OpenBSD patch patch-tkrat_options_tcl
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD$
|--- tkrat/options.tcl.orig Sat May 5 03:55:06 2012
|+++ tkrat/options.tcl Sat May 5 03:55:19 2012
--
Patching file tkrat/options.tcl using Plan A...
Hunk #1 succeeded at 535.
done
===> Ignoring patchfile patch-tkrat_options_tcl.orig
===> Applying OpenBSD patch patch-tkrat_start_tcl
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD$
|--- tkrat/start.tcl.orig Wed Sep 24 00:40:15 2003
|+++ tkrat/start.tclSat May 5 03:57:52 2012
--
Patching file tkrat/start.tcl using Plan A...
Hunk #1 succeeded at 91.
Hunk #2 succeeded at 500.
done
===> Ignoring patchfile patch-tkrat_start_tcl.orig
===> Applying OpenBSD patch patch-util_Makefile_in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|--- util/Makefile.in.orig 2003-09-23 14:13:37.0 -0400
|+++ util/Makefile.in 2003-12-20 18:44:56.0 -0500
--
Patching file util/Makefile.in using Plan A...
Hunk #1 succeeded at 37.
Hunk #2 succeeded at 69.
Hunk #3 succeeded at 105.
done
===> Ignoring patchfile patch-util_Makefile_in.orig
===> Ignoring patchfile patch-util_Makefile_in.rej
===> Configuring for tkrat-2.1.2p3
Using /usr/obj/ports/tkrat-2.1.2/config.site (generated)
loading site script /usr/obj/ports/tkrat-2.1.2/config.site
creating cache ./config.cache
checking for gcc... cc
checking whether the C compiler (cc -O2 -pipe -Wall ) works...
FIX: net/ntop (needs NO_REGRESS)
While testing a libpcap diff, I ran regression tests on all pcap-based
ports and discovered that net/ntop and net/libnetdude/libnetdude have
broken regress targets.
net/ntop doesn't have a test suite at all, so it needs NO_REGRESS to be
set to Yes.
I'll send a diff for net/libnetdude/libnetdude in a separate email.
Lawrence
Index: Makefile
===
RCS file: /cvs/ports/net/ntop/Makefile,v
retrieving revision 1.31
diff -u -p Makefile
--- Makefile12 Mar 2012 17:16:19 - 1.31
+++ Makefile5 May 2012 04:51:23 -
@@ -27,6 +27,8 @@ USE_GROFF = Yes
ALL_TARGET=
INSTALL_TARGET=install install-man
+NO_REGRESS=Yes
+
post-install:
@chmod 700 ${PREFIX}/sbin/ntop
@strip ${PREFIX}/sbin/ntop
FIX: net/libnetdude/libnetdude (fix regress)
net/libnetdude/libnetdude has a test suite but does not build correctly.
This diff makes it build and run by doing the following:
- Set REGRESS_DEPENDS = ${FULLPKGPATH} because the test suite needs the
libnetdude package itself to be installed in order to build and run.
- Make the "check" target in test/Makefile actually execute the test
suite, instead of just building the test programs and exiting.
- Change the test suite program (test/lnd-test.c) to include
netinet/if_ether.h instead of net/ethernet.h which does not exist on
OpenBSD.
- Fix the last test to report the correct result.
- Let lnd-test exit with exit code 1 if any tests fail (previously it
would always exit with exit code 0 even if tests fail).
The test suite still fails due to the failure of one test, but at least
it builds and runs now. :)
Tested on amd64. Comments and more tests appreciated.
Lawrence
Index: Makefile
===
RCS file: /cvs/ports/net/libnetdude/libnetdude/Makefile,v
retrieving revision 1.13
diff -N -u -p Makefile
--- Makefile8 Dec 2011 22:16:28 - 1.13
+++ Makefile7 May 2012 03:42:13 -
@@ -3,7 +3,7 @@
COMMENT= packet manipulation backend of Netdude framework
DISTNAME= libnetdude-0.10a
-REVISION= 2
+REVISION= 3
SHARED_LIBS= netdude 1.0
CATEGORIES=net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netdude/}
@@ -13,6 +13,7 @@ HOMEPAGE= http://netdude.sourceforge.net/
LIB_DEPENDS= net/libpcapnav \
devel/glib \
devel/libtool,-ltdl
+REGRESS_DEPENDS= ${FULLPKGPATH}
# BSD
PERMIT_PACKAGE_CDROM= Yes
Index: patches/patch-test_Makefile_in
===
RCS file: patches/patch-test_Makefile_in
diff -N -u -p patches/patch-test_Makefile_in
--- /dev/null 6 May 2012 21:42:13 -
+++ patches/patch-test_Makefile_in 7 May 2012 03:42:13 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Actually run the test suite when "make check" is executed.
+
+--- test/Makefile.in.orig Sun Jun 24 17:37:52 2007
test/Makefile.in Sun May 6 23:35:24 2012
+@@ -405,6 +405,7 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ check: check-am
++ $(srcdir)/lnd-test
+ all-am: Makefile
+ installdirs:
+ install: install-am
Index: patches/patch-test_lnd_test_c
===
RCS file: patches/patch-test_lnd_test_c
diff -N -u -p patches/patch-test_lnd_test_c
--- /dev/null 6 May 2012 21:42:13 -
+++ patches/patch-test_lnd_test_c 7 May 2012 03:42:13 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+- OpenBSD does not have net/ethernet.h, use netinet/if_ether.h instead.
+
+- The "read-write filtering (growing trace)" test should be checking the
+ res_filters_3 variable for test results.
+
+- Exit with exit code 1 if any tests fail.
+
+--- test/lnd-test.c.orig Tue Nov 11 06:32:59 2003
test/lnd-test.cSat May 5 00:27:29 2012
+@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALI
+
+ #include
+
+-#include
++#include
+ #include
+ #include
+
+@@ -721,7 +721,21 @@ main(int argc, char **argv)
+ printf("[%s] editing three overlapping areas\n", res_it_areas_3 ? "ok" :
"--");
+ printf("[%s] read-only filtering\n", res_filters_1 ? "ok" : "--");
+ printf("[%s] read-write filtering (shrinking trace)\n", res_filters_2 ?
"ok" : "--");
+- printf("[%s] read-write filtering (growing trace)\n", res_filters_2 ? "ok"
: "--");
++ printf("[%s] read-write filtering (growing trace)\n", res_filters_3 ? "ok"
: "--");
++
++ if (!res_init ||
++!res_load ||
++!res_jump_time ||
++!res_jump ||
++!res_it_loaded ||
++!res_it_blocks ||
++!res_it_areas_1 ||
++!res_it_areas_2 ||
++!res_it_areas_3 ||
++!res_filters_1 ||
++!res_filters_2 ||
++!res_filters_3)
++return 1;
+
+ return 0;
+ }
Re: [WIP] devel/eclipse4/sdk
Embarassingly, it turns out at some point I created a /usr/include/X11 -> /usr/X11R6/include/X11 symlink on my dev system and this masked an issue in the original Eclipse 4 tarball I sent out. Attached tarball has been corrected for this. (You still need the "eclipse-natives" distfile from the original mail.) On Fri, May 04, 2012 at 02:57:22PM -0700, Matthew Dempsky wrote: > Attached is a port for Eclipse SDK 4.1.2. I've only tested it on > amd64, but it should (might?) work on i386 too. For the time being, > there's no upstream for the "eclipse-natives" distfile, so just add > the attached copy directly to your distfiles directory. > > Once installed, Eclipse should "Just Work". The eclipse executable is > located at /usr/local/eclipse4/eclipse, and you'll need to make sure > /usr/local/jdk-1.7.0/bin is on your PATH and possibly bump your memory > limits too. > > Please let me know if you find anything that doesn't work correctly. > > > Background: > > After spending weeks of frustration trying all of the different build > options available for Eclipse SDK, I finally made a break through with > a hacky solution that actually works reasonably well IMO: simply take > the official Eclipse Linux binary distribution tarball and then swap > out the handful of Linux native code files with appropriately compiled > OpenBSD replacements. > > Because there doesn't seem to be any convenient place to fetch the > native libraries source code from, I decided to write a simple > "make-natives-snapshot.sh" that downloads the minimal code needed from > the Eclipse's git repositories and then creates a timestamped tarball. > > There are ways the package could likely be improved (e.g., install the > native libraries in /usr/local/lib/eclipse4 or something rather than > stuffing them back into Eclipse's bundled jar files, or splitting out > the xulrunner and webkit dependencies into separate subpackages so you > don't need both), but I'm erring on the side of simplicity for now. eclipse4-sdk.tar.gz Description: application/tar-gz
