cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot to remove old patches, and fix ${LOCALBASE} in

Browse Source 
patch-config_init_hints_openbsd_pm. Reminded by Pascal Stumpf, thanks!
This commit is contained in:
landry 2011-03-09 22:48:32 +00:00
parent 073e9e6b72
commit 180dff3a0d
4 changed files with 10 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lang/parrot/patches/patch-config_gen_makefiles_dynpmc_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-config_gen_makefiles_dynpmc_in,v 1.1 2010/10/03 22:13:18 kili Exp $
--- config/gen/makefiles/dynpmc.in.orig Fri Apr 17 17:06:01 2009
+++ config/gen/makefiles/dynpmc.in Sun Oct 3 23:27:58 2010
@@ -42,7 +42,6 @@ PMC_TARGETS := \
subproxy$(LOAD_EXT)
PMCS_DIGEST := \
- md2.pmc \
md4.pmc \
md5.pmc \
ripemd160.pmc \
@@ -52,7 +51,6 @@ PMCS_DIGEST := \
sha512.pmc
OBJS_DIGEST := \
- md2$(O) \
md4$(O) \
md5$(O) \
ripemd160$(O) \

15
lang/parrot/patches/patch-config_init_hints_openbsd_pm
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_init_hints_openbsd_pm,v 1.3 2011/03/08 20:12:15 landry Exp $
$OpenBSD: patch-config_init_hints_openbsd_pm,v 1.4 2011/03/09 22:48:32 landry Exp $
--- config/init/hints/openbsd.pm.orig Thu Jan 6 04:44:55 2011
+++ config/init/hints/openbsd.pm Tue Feb 8 15:17:00 2011
@@ -17,10 +17,15 @@ sub runstep {
+++ config/init/hints/openbsd.pm Wed Mar 9 23:44:36 2011
@@ -17,13 +17,18 @@ sub runstep {
$conf->data->set( ccflags => $ccflags );
my $libs = $conf->data->get('libs');
@ -15,8 +15,13 @@ $OpenBSD: patch-config_init_hints_openbsd_pm,v 1.3 2011/03/08 20:12:15 landry Ex
+=cut
+
my $ldflags = $conf->data->get('ldflags');
if ( $ldflags !~ m|-L/usr/local/lib\b| ) {
$ldflags .= ' -L/usr/local/lib';
- if ( $ldflags !~ m|-L/usr/local/lib\b| ) {
- $ldflags .= ' -L/usr/local/lib';
+ if ( $ldflags !~ m|-L${LOCALBASE}/lib\b| ) {
+ $ldflags .= ' -L${LOCALBASE}/lib';
}
$conf->data->set(
@@ -34,9 +39,9 @@ sub runstep {
has_dynamic_linking => 1,

20
lang/parrot/patches/patch-config_init_install_pm
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-config_init_install_pm,v 1.1 2009/06/17 09:34:35 simon Exp $
--- config/init/install.pm.orig Fri Apr 17 17:06:00 2009
+++ config/init/install.pm Wed May 27 01:44:54 2009
@@ -47,6 +47,7 @@ sub runstep {
$versiondir .= "/$version";
$versiondir .= $conf->option_or_data('DEVEL');
}
+ $versiondir = '/parrot';
# --bindir=DIR user executables [EPREFIX/bin]
my $bindir = assign_dir( $conf, 'bindir', $eprefix, '/bin' );
@@ -105,7 +106,7 @@ sub runstep {
srcdir => $srcdir,
# parrot internal use only
- doc_dir => $datadir . "/doc",
+ doc_dir => $datadir . "/doc/parrot",
versiondir => $versiondir,
);

27
lang/parrot/patches/patch-tools_dev_install_files_pl
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-tools_dev_install_files_pl,v 1.1 2009/06/17 09:34:35 simon Exp $
--- tools/dev/install_files.pl.orig Wed May 20 02:29:15 2009
+++ tools/dev/install_files.pl Wed May 27 01:37:51 2009
@@ -98,12 +98,12 @@ while (<>) {
}
elsif ( $meta{include} ) {
$dest =~ s/^include//;
- $dest = File::Spec->catdir( $options{includedir}, $parrotdir, $dest );
+ $dest = File::Spec->catdir( $options{includedir}, $dest );
}
elsif ( $meta{doc} ) {
$dest =~ s/^docs\/resources/resources/; # resources go in the top level of docs
$dest =~ s/^docs/pod/; # other docs are actually raw Pod
- $dest = File::Spec->catdir( $options{docdir}, $parrotdir, $dest );
+ $dest = File::Spec->catdir( $options{docdir}, $dest );
}
elsif ( $meta{pkgconfig} ) {
@@ -111,7 +111,7 @@ while (<>) {
# as it is typically done with automake installed packages. If there
# is a use case to make this configurable we'll add a seperate
# --pkgconfigdir option.
- $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
+ $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
}
elsif ( /^compilers/ ) {
$dest =~ s/^compilers/languages/;