Browse code

New install.sub; update root.mail

Jaidyn Levesque authored on 2019-06-24 04:55:54
Showing 1 changed files
... ...
@@ -1,134 +1,55 @@
1
-#!/bin/ksh
2
-
3
-#########################
4
-# Name: ports_rebrand.sh
5
-# Main: jadedctrl
6
-# Lisc: ISC
7
-# Desc: Editing OBSD ports
8
-#       tree for use with
9
-#       LBSD.
10
-#########################
11
-
12
-# Usage: ports_deblob.sh
1
+#!/bin/sh
2
+########################################
3
+# name: ports_rebrand.sh
4
+# main: jadedctrl
5
+# lisc: isc
6
+# desc: editing obsd ports tree for use
7
+#       with lbsd.
8
+########################################
13 9
 
14 10
 . ./libdeblob.sh
15 11
 
16
-PATCH_DIR=/tmp/ports_rebrand/
17
-
18
-if [ -e $PATCH_DIR ]
19
-then
20
-	self_destruct_sequence $PATCH_DIR
21
-	mkdir $PATCH_DIR
22
-else
23
-	mkdir $PATCH_DIR
12
+if test -z "$1"; then
13
+	echo "usage: ports_rebrand.sh ports_dir"
14
+else	
15
+	SRC_DIR="$1"
24 16
 fi
25 17
 
26
-if test -z $1
27
-then
28
-	SRC_DIR=/usr/ports/
29
-else
30
-	SRC_DIR=$1
31
-fi
32
-
33
-
34
-portdirs="archivers astro audio biology books cad chinese comms converters databases devel"
35
-portdirs="$portdirs editors education emulators fonts games geo graphics inputmethods" 
36
-portdirs="$portdirs japanese java korean lang mail math meta misc multimedia net news plan9"
37
-portdirs="$portdirs print productivity security shells sysutils telephony textproc www x11"
38
-
39
-
40
-
41
-# for GNU autoconf
42
-# -----------------
43
-for portdir in $portdirs
44
-do
45
-        for portpath in $SRC_DIR/$portdir/*
46
-        do
47
-		port=$(echo $portpath | sed 's^'"$SRC_DIR"'/^^')
48
-		if grep "=.*gnu" $portpath/Makefile > /dev/null 
49
-		then
50
-			lineadd ".include <bsd.port.mk>" "CONFIGURE_ENV +=	build_alias=\"\${ARCH}-unknown-openbsd6.3\"" $port/Makefile
51
-		fi
52
-	done	
53
-done
54
-
55
-for portdir in $portdirs
56
-do
57
-        for portpath in $SRC_DIR/$portdir/*
58
-        do
59
-                port=$(echo $portpath | sed 's^'"$SRC_DIR"'/^^')
60
-                if grep "CONFIGURE_STYLE=gnu" $portpath/Makefile > /dev/null
61
-                then
62
-                        lineadd ".include <bsd.port.mk>" "CONFIGURE_ENV +=      build_alias=\"\${ARCH}-unknown-openbsd6.3\"" $port/Makefile
63
-                fi
64
-        done
65
-done
66
-
67
-
68
-# for cmake
69
-# -----------------
70
-for portdir in $portdirs
71
-do
72
-        for portpath in $SRC_DIR/$portdir/*
73
-        do
74
-                port=$(echo $portpath | sed 's^'"$SRC_DIR"'/^^')
75
-                if grep "cmake" $portpath/Makefile > /dev/null
76
-                then
77
-                        lineadd ".include <bsd.port.mk>" "CONFIGURE_ARGS +=      -DCMAKE_SYSTEM_NAME=OpenBSD" $port/Makefile
78
-                fi
79
-        done
80
-done
18
+PATCH_DIR=/tmp/ports_rebrand/
19
+mkdir "$PATCH_DIR" 2> /dev/null
81 20
 
82 21
 
22
+# --------------------------------------
83 23
 
84
-# Port-specific changes for build
85
-rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
86
-lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
87
-lineadd "pre-configure:" "        @cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
88
-lineadd "\${WRKSRC}/config" "        @cp \${FILESDIR}/Makefile.openbsd ${WRKSRC}/config/Makefile.libertybsd" graphics/glew/Makefile
89
-dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
90
-lineadd "pre-configure:" "        @cp \${FILESDIR}/platforms/LibertyBSD.cmake \${WRKSRC}/cmake/platforms/LibertyBSD.cmake" devel/llvm/Makefile
91
-dircp files/ports/files/llvm/ devel/llvm/files/
92
-rep "-no-ssse3 -no-sse3" "-no-ssse3 -no-sse3 -platform openbsd-g++" x11/qt5/qtbase/Makefile
93
-rep "--enable-shared" "--enable-shared --target-os=openbsd" graphics/ffmpeg/Makefile
24
+portdirs="archivers astro audio biology books cad chinese comms converters"
25
+portdirs="$portdirs databases devel editors education emulators fonts games geo" 
26
+portdirs="$portdirs graphics inputmethods japanese java korean lang mail math"
27
+portdirs="$portdirs meta misc multimedia net news plan9 print productivity"
28
+portdirs="$portdirs security shells sysutils telephony textproc www x11"
94 29
 
95
-# *.mk edits
96
-rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/perl.port.mk
30
+# --------------------------------------
97 31
 
98
-# Misc. infrastructure edits
99
-lineadd "*:OpenBSD:*:*)" "*:LibertyBSD:*:*)" infrastructure/db/config.guess
100
-lineadd "*:OpenBSD:*:*)" "        exit ;;" infrastructure/db/config.guess
101
-lineadd "*:OpenBSD:*:*)" "        echo \${UNAME_MACHINE_ARCH}-unknown-openbsd\${UNAME_RELEASE}" infrastructure/db/config.guess
102
-lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'\`" infrastructure/db/config.guess
32
+rep	"ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" \
33
+	"ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd64.iso" \
34
+	emulators/qemu/pkg/README 
35
+rep	"ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso" \
36
+	"ftp.libertybsd.net/pub/LibertyBSD/snapshots/amd64/cd64.iso" \
37
+	emulators/qemu/pkg/README
38
+linedel "\$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso" \
39
+	emulators/qemu/pkg/README
40
+rep "install52.fs" "install64.fs" emulators/qemu/pkg/README
41
+rep "install52.iso" "install64.iso" emulators/qemu/pkg/README
42
+rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README
103 43
 
104
-# Go through ports with additional patches for LBSD
105
-for category in files/ports/files/patches/*
106
-do
107
-	category_name="$(echo $category | sed 's^.*/^^')"
108
-	for port in $category
109
-	do
110
-		port_name="$(echo $port | sed 's^.*/^^')"
111
-		for patch in $port
112
-		do
113
-			patch_name="$(echo $patch | sed 's^.*/^^')"
114
-			filecp "files/ports/file/patches/$category_name/$port_name/$patch_name" "$category_name/$port_name/patches/$patch_name"
115
-		done
116
-	done
117
-done
44
+rep "ftp.openbsd.org" "ftp.libertybsd.net" \
45
+sysutils/ruby-puppet/4/patches/patch-lib_puppet_provider_package-openbsd_rb
118 46
 
47
+rep "on OpenBSD" "on LibertyBSD" sysutils/sysmon/pkg/README
48
+rep "openbsd.org" "libertybsd.net" sysutils/sysmon/pkg/README
119 49
 
120
-# Port-specific changes for rebranding
121
-rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd63.iso" emulators/qemu/pkg/README 
122
-rep "ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/amd64/cd63.iso" emulators/qemu/pkg/README
123
-linedel "\$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso" emulators/qemu/pkg/README
124
-rep "install52.fs" "install63.fs" emulators/qemu/pkg/README
125
-rep "install52.iso" "install63.iso" emulators/qemu/pkg/README
126
-rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README
127
-rep "ftp.openbsd.org" "ftp.libertybsd.net" sysutils/ruby-puppet/4/patches/patch-lib_puppet_provider_package-openbsd_rb
128
-rep "on OpenBSD" "on LibertyBSD" sysutils/sysmon/pkg/README ; rep "openbsd.org" "libertybsd.net" sysutils/sysmon/pkg/README
129 50
 rep "=\"OpenBSD " "=\"LibertyBSD " multimedia/gstreamer-0.10/Makefile.inc
130 51
 rep "openbsd.org" "libertybsd.net" multimedia/gstreamer-0.10/Makefile.inc
131
-# @jimmybot for this :) ^^
52
+
132 53
 rep "www.openbsd.org" "libertybsd.net" www/lynx/patches/patch-lynx_cfg
133 54
 
134 55
 apply
Browse code

Removed kernel-level rebranding

Jaidyn Lev authored on 2018-07-08 21:17:03
Showing 1 changed files
... ...
@@ -3,7 +3,8 @@
3 3
 #########################
4 4
 # Name: ports_rebrand.sh
5 5
 # Main: jadedctrl
6
-# Lisc: ISC # Desc: Editing OBSD ports
6
+# Lisc: ISC
7
+# Desc: Editing OBSD ports
7 8
 #       tree for use with
8 9
 #       LBSD.
9 10
 #########################
Browse code

Minour port updates

Jaidyn Lev authored on 2018-06-01 15:01:47
Showing 1 changed files
... ...
@@ -30,26 +30,56 @@ else
30 30
 fi
31 31
 
32 32
 
33
-. ./files/ports/aliafy.sh
33
+portdirs="archivers astro audio biology books cad chinese comms converters databases devel"
34
+portdirs="$portdirs editors education emulators fonts games geo graphics inputmethods" 
35
+portdirs="$portdirs japanese java korean lang mail math meta misc multimedia net news plan9"
36
+portdirs="$portdirs print productivity security shells sysutils telephony textproc www x11"
34 37
 
35
-# Add the build_alias env variable to listed ports
36
-for port in $portlist
38
+
39
+
40
+# for GNU autoconf
41
+# -----------------
42
+for portdir in $portdirs
37 43
 do
38
-	rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd6.1\"" $port/Makefile
39
-	lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd6.1\"" ".include <bsd.port.mk>" $port/Makefile
44
+        for portpath in $SRC_DIR/$portdir/*
45
+        do
46
+		port=$(echo $portpath | sed 's^'"$SRC_DIR"'/^^')
47
+		if grep "=.*gnu" $portpath/Makefile > /dev/null 
48
+		then
49
+			lineadd ".include <bsd.port.mk>" "CONFIGURE_ENV +=	build_alias=\"\${ARCH}-unknown-openbsd6.3\"" $port/Makefile
50
+		fi
51
+	done	
40 52
 done
41 53
 
54
+for portdir in $portdirs
55
+do
56
+        for portpath in $SRC_DIR/$portdir/*
57
+        do
58
+                port=$(echo $portpath | sed 's^'"$SRC_DIR"'/^^')
59
+                if grep "CONFIGURE_STYLE=gnu" $portpath/Makefile > /dev/null
60
+                then
61
+                        lineadd ".include <bsd.port.mk>" "CONFIGURE_ENV +=      build_alias=\"\${ARCH}-unknown-openbsd6.3\"" $port/Makefile
62
+                fi
63
+        done
64
+done
42 65
 
43
-. ./files/ports/caliafy.sh
44 66
 
45
-# Add the -DCMAKE_SYSTEM_NAME argument to listed ports
46
-for port in $portlist
67
+# for cmake
68
+# -----------------
69
+for portdir in $portdirs
47 70
 do
48
-	rep ".include <bsd.port.mk>" "CONFIGURE_ARGS +=        -DCMAKE_SYSTEM_NAME=OpenBSD" $port/Makefile
49
-	lineadd  "CONFIGURE_ARGS +=        -DCMAKE_SYSTEM_NAME=OpenBSD" ".include <bsd.port.mk>" $port/Makefile
71
+        for portpath in $SRC_DIR/$portdir/*
72
+        do
73
+                port=$(echo $portpath | sed 's^'"$SRC_DIR"'/^^')
74
+                if grep "cmake" $portpath/Makefile > /dev/null
75
+                then
76
+                        lineadd ".include <bsd.port.mk>" "CONFIGURE_ARGS +=      -DCMAKE_SYSTEM_NAME=OpenBSD" $port/Makefile
77
+                fi
78
+        done
50 79
 done
51 80
 
52 81
 
82
+
53 83
 # Port-specific changes for build
54 84
 rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
55 85
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
... ...
@@ -87,11 +117,11 @@ done
87 117
 
88 118
 
89 119
 # Port-specific changes for rebranding
90
-rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd61.iso" emulators/qemu/pkg/README 
91
-rep "ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/amd64/cd61.iso" emulators/qemu/pkg/README
120
+rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd63.iso" emulators/qemu/pkg/README 
121
+rep "ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/amd64/cd63.iso" emulators/qemu/pkg/README
92 122
 linedel "\$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso" emulators/qemu/pkg/README
93
-rep "install52.fs" "install61.fs" emulators/qemu/pkg/README
94
-rep "install52.iso" "install61.iso" emulators/qemu/pkg/README
123
+rep "install52.fs" "install63.fs" emulators/qemu/pkg/README
124
+rep "install52.iso" "install63.iso" emulators/qemu/pkg/README
95 125
 rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README
96 126
 rep "ftp.openbsd.org" "ftp.libertybsd.net" sysutils/ruby-puppet/4/patches/patch-lib_puppet_provider_package-openbsd_rb
97 127
 rep "on OpenBSD" "on LibertyBSD" sysutils/sysmon/pkg/README ; rep "openbsd.org" "libertybsd.net" sysutils/sysmon/pkg/README
Browse code

Merged aliafy

Jade Levesque authored on 2017-08-13 20:36:44
Showing 0 changed files
Browse code

Progress

Jade Levesque authored on 2017-08-11 04:19:54
Showing 1 changed files
... ...
@@ -98,5 +98,6 @@ rep "on OpenBSD" "on LibertyBSD" sysutils/sysmon/pkg/README ; rep "openbsd.org"
98 98
 rep "=\"OpenBSD " "=\"LibertyBSD " multimedia/gstreamer-0.10/Makefile.inc
99 99
 rep "openbsd.org" "libertybsd.net" multimedia/gstreamer-0.10/Makefile.inc
100 100
 # @jimmybot for this :) ^^
101
+rep "www.openbsd.org" "libertybsd.net" www/lynx/patches/patch-lynx_cfg
101 102
 
102 103
 apply
Browse code

Replace spaces by tabs

Einhard Leichtfuß authored on 2017-08-08 18:07:31
Showing 1 changed files
... ...
@@ -16,17 +16,17 @@ PATCH_DIR=/tmp/ports_rebrand/
16 16
 
17 17
 if [ -e $PATCH_DIR ]
18 18
 then
19
-        self_destruct_sequence $PATCH_DIR
19
+	self_destruct_sequence $PATCH_DIR
20 20
 	mkdir $PATCH_DIR
21 21
 else
22
-        mkdir $PATCH_DIR
22
+	mkdir $PATCH_DIR
23 23
 fi
24 24
 
25 25
 if test -z $1
26 26
 then
27
-        SRC_DIR=/usr/ports/
27
+	SRC_DIR=/usr/ports/
28 28
 else
29
-        SRC_DIR=$1
29
+	SRC_DIR=$1
30 30
 fi
31 31
 
32 32
 
Browse code

Split ports_rebrand into a few different chunks

Jade Levesque authored on 2017-07-20 00:55:55
Showing 1 changed files
... ...
@@ -30,37 +30,7 @@ else
30 30
 fi
31 31
 
32 32
 
33
-# List of ports that require an OBSD build_alias env var
34
-astrolist="astro/gcal astro/wcslib"
35
-archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo archivers/xz archivers/zziplib archivers/gcab"
36
-archiverslist="$archiverslsit archivers/lzop archivers/par2cmdline"
37
-audiolist="audio/freealut audio/akode audio/twolame audio/audacious audio/pulseaudio audio/jack audio/libcue audio/audacious-plugins audio/ardour audio/soundtouch multimedia/gstreamer1/mm"
38
-converterslist="converters/libiconv"
39
-dabataseslist="databases/db/v3 databases/db/v4 databases/openldap databases/sqlite3 databases/gdbm databases/yasm databases/iodbc databases/mariadb"
40
-devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/autoconf/2.56 devel/autoconf/2.57 devel/autoconf/2.58 devel/autoconf/2.59 devel/autoconf/2.60"
41
-devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.63 devel/autoconf/2.64 devel/autoconf/2.65 devel/autoconf/2.66 devel/autoconf/2.67 devel/autoconf/2.68"
42
-devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
43
-devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
44
-devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection devel/yasm devel/sdl devel/cppunit devel/json-glib"
45
-devellist="$devellist devel/libsoup devel/libsigc++-2 devel/glib2mm devel/atk2mm devel/libnotify devel/npth devel/check devel/pangomm devel/scons"
46
-editorslist="editors/nano"
47
-gameslist="games/xscorch"
48
-graphicslist="graphics/cairo graphics/gd"
49
-geolist="geo/spatialindex"
50
-langlist="lang/ghc lang/clisp lang/gawk lang/guile lang/ghc"
51
-maillist="mail/mutt mail/alpine"
52
-mathlist="math/graphviz"
53
-multimedialist="multimedia/xvidcore"
54
-netlist="net/openvpn net/librest"
55
-printlist="print/libpaper print/texlive/base print/texlive/texmf print/psutils"
56
-securitylist="security/cyrus-sasl2 security/libmcrypt security/libtasn1 security/p11-kit security/pinentry"
57
-shellslist="shells/bash"
58
-sysutilslist="sysutils/e2fsprogs sysutils/polkit sysutils/consolekit"
59
-textproclist="textproc/groff textproc/jq textproc/rapto textproc/raptorr"
60
-wwwlist="www/lynx www/apache-httpd"
61
-x11list="x11/gnome/at-spi2-core x11/gnome/at-spi2-atk x11/gnome/py-atspi x11/gnome/libsecret x11/gnome/gcr x11/xkbcommon x11/gtk2mm x11/gnome/libgnomecanvasmm x11/gtk3mm"
62
-
63
-portlist="$archiverslist $audiolist $databaseslist $devellist $editorslist $gameslist $geolist $langlist $maillist $multimedia $netlist $securitylist $sysutilslist $textproclist $wwwlist"
33
+. ./files/ports/aliafy.sh
64 34
 
65 35
 # Add the build_alias env variable to listed ports
66 36
 for port in $portlist
... ...
@@ -70,12 +40,7 @@ do
70 40
 done
71 41
 
72 42
 
73
-# List of ports that require an OpenBSD CMAKE_SYSTEM_NAME
74
-audiolist="audio/chromaprint audio/liblastfm"
75
-devellist="devel/cmocka devel/doxygen"
76
-netlist="net/libmygpo-qt"
77
-
78
-portlist="$audiolist $devellist $netlist"
43
+. ./files/ports/caliafy.sh
79 44
 
80 45
 # Add the -DCMAKE_SYSTEM_NAME argument to listed ports
81 46
 for port in $portlist
... ...
@@ -105,48 +70,6 @@ lineadd "*:OpenBSD:*:*)" "        exit ;;" infrastructure/db/config.guess
105 70
 lineadd "*:OpenBSD:*:*)" "        echo \${UNAME_MACHINE_ARCH}-unknown-openbsd\${UNAME_RELEASE}" infrastructure/db/config.guess
106 71
 lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'\`" infrastructure/db/config.guess
107 72
 
108
-# Problem childs:
109
-# * lang/python 	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
110
-# * lang/tcl
111
-# * x11/tk
112
-# * devel/llvm
113
-# * security/gnutls
114
-# * lang/ruby   	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
115
-# * gobject-introspection
116
-# * lang/mono   	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
117
-# * mozjs17	Need to figure out how to create a build_alias... the env var and config arg used in other ports doesn't work.
118
-# * multimedia/libvpx	"Toolchain unable to link executables"
119
-# * p5-Curses
120
-# * libproxy	ld issue
121
-# * x11/gtk\+3
122
-# * graphics/openjp2	ninja; ld issue
123
-# * devel/jdk/1.7
124
-# * audio/libsoxr	ninja; ...
125
-# * databases/mariadb
126
-# * multimedia/libv4l
127
-# * multimedia/x26[45] --host=${ARCH}-unknown-openbsd6.1
128
-# * graphics/ffmpeg	Unable to test cc.
129
-# * x11/qt4
130
-# * x11/qt5/qtbase
131
-# * x11/qt5/qtdeclarative
132
-# * x11/qt5/qttools
133
-# * gstreamer/plugins-base
134
-# * p5-Module-Build
135
-# * libmusicbrainz
136
-# * libmusicbrainz5
137
-# * bioperl
138
-# * lang/g77
139
-# * qtmultimedia
140
-# * qtdeclarative
141
-# * qtsvg
142
-# * audio/cantata
143
-
144
-# The recurring theme I'm noticing here is the 'cannot run C compiled programs' issue. If that's solved, everything else should be smooth
145
-# sailing....
146
-# Unfortunately some of the more important packages encounter this issue.
147
-
148
-# Note to self: gc*
149
-
150 73
 # Go through ports with additional patches for LBSD
151 74
 for category in files/ports/files/patches/*
152 75
 do
Browse code

Progression

Jade Levesque authored on 2017-07-18 20:35:50
Showing 1 changed files
... ...
@@ -71,10 +71,11 @@ done
71 71
 
72 72
 
73 73
 # List of ports that require an OpenBSD CMAKE_SYSTEM_NAME
74
-audiolist="audio/chromaprint"
74
+audiolist="audio/chromaprint audio/liblastfm"
75 75
 devellist="devel/cmocka devel/doxygen"
76
+netlist="net/libmygpo-qt"
76 77
 
77
-portlist="$devellist"
78
+portlist="$audiolist $devellist $netlist"
78 79
 
79 80
 # Add the -DCMAKE_SYSTEM_NAME argument to listed ports
80 81
 for port in $portlist
... ...
@@ -88,6 +89,7 @@ done
88 89
 rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
89 90
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
90 91
 lineadd "pre-configure:" "        @cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
92
+lineadd "\${WRKSRC}/config" "        @cp \${FILESDIR}/Makefile.openbsd ${WRKSRC}/config/Makefile.libertybsd" graphics/glew/Makefile
91 93
 dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
92 94
 lineadd "pre-configure:" "        @cp \${FILESDIR}/platforms/LibertyBSD.cmake \${WRKSRC}/cmake/platforms/LibertyBSD.cmake" devel/llvm/Makefile
93 95
 dircp files/ports/files/llvm/ devel/llvm/files/
Browse code

Various progressions in ports

Jade Levesque authored on 2017-07-18 16:09:36
Showing 1 changed files
... ...
@@ -3,8 +3,7 @@
3 3
 #########################
4 4
 # Name: ports_rebrand.sh
5 5
 # Main: jadedctrl
6
-# Lisc: ISC
7
-# Desc: Editing OBSD ports
6
+# Lisc: ISC # Desc: Editing OBSD ports
8 7
 #       tree for use with
9 8
 #       LBSD.
10 9
 #########################
... ...
@@ -32,32 +31,36 @@ fi
32 31
 
33 32
 
34 33
 # List of ports that require an OBSD build_alias env var
35
-archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo archivers/xz"
34
+astrolist="astro/gcal astro/wcslib"
35
+archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo archivers/xz archivers/zziplib archivers/gcab"
36 36
 archiverslist="$archiverslsit archivers/lzop archivers/par2cmdline"
37
-audiolist="audio/freealut"
37
+audiolist="audio/freealut audio/akode audio/twolame audio/audacious audio/pulseaudio audio/jack audio/libcue audio/audacious-plugins audio/ardour audio/soundtouch multimedia/gstreamer1/mm"
38 38
 converterslist="converters/libiconv"
39
-dabataseslist="databases/db/v3 databases/db/v4 databases/openldap databases/sqlite3 databases/gdbm"
39
+dabataseslist="databases/db/v3 databases/db/v4 databases/openldap databases/sqlite3 databases/gdbm databases/yasm databases/iodbc databases/mariadb"
40 40
 devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/autoconf/2.56 devel/autoconf/2.57 devel/autoconf/2.58 devel/autoconf/2.59 devel/autoconf/2.60"
41 41
 devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.63 devel/autoconf/2.64 devel/autoconf/2.65 devel/autoconf/2.66 devel/autoconf/2.67 devel/autoconf/2.68"
42 42
 devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
43 43
 devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
44
-devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection devel/yasm"
45
-x11list="x11/gnome/at-spi2-core x11/gnome/at-spi2-atk"
44
+devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection devel/yasm devel/sdl devel/cppunit devel/json-glib"
45
+devellist="$devellist devel/libsoup devel/libsigc++-2 devel/glib2mm devel/atk2mm devel/libnotify devel/npth devel/check devel/pangomm devel/scons"
46 46
 editorslist="editors/nano"
47 47
 gameslist="games/xscorch"
48
-graphicslist="graphics/cairo"
48
+graphicslist="graphics/cairo graphics/gd"
49 49
 geolist="geo/spatialindex"
50
-langlist="lang/ghc lang/clisp"
50
+langlist="lang/ghc lang/clisp lang/gawk lang/guile lang/ghc"
51 51
 maillist="mail/mutt mail/alpine"
52
-netlist="net/openvpn"
53
-printlist="print/libpaper"
54
-securitylist="security/cyrus-sasl2 security/libmcrypt security/libtasn1 security/p11-kit"
52
+mathlist="math/graphviz"
53
+multimedialist="multimedia/xvidcore"
54
+netlist="net/openvpn net/librest"
55
+printlist="print/libpaper print/texlive/base print/texlive/texmf print/psutils"
56
+securitylist="security/cyrus-sasl2 security/libmcrypt security/libtasn1 security/p11-kit security/pinentry"
55 57
 shellslist="shells/bash"
56
-sysutilslist="sysutils/e2fsprogs"
57
-textproclist="textproc/groff"
58
+sysutilslist="sysutils/e2fsprogs sysutils/polkit sysutils/consolekit"
59
+textproclist="textproc/groff textproc/jq textproc/rapto textproc/raptorr"
58 60
 wwwlist="www/lynx www/apache-httpd"
61
+x11list="x11/gnome/at-spi2-core x11/gnome/at-spi2-atk x11/gnome/py-atspi x11/gnome/libsecret x11/gnome/gcr x11/xkbcommon x11/gtk2mm x11/gnome/libgnomecanvasmm x11/gtk3mm"
59 62
 
60
-portlist="$archiverslist $audiolist $databaseslist $devellist $editorslist $gameslist $geolist $langlist $maillist $netlist $securitylist $sysutilslist $textproclist $wwwlist"
63
+portlist="$archiverslist $audiolist $databaseslist $devellist $editorslist $gameslist $geolist $langlist $maillist $multimedia $netlist $securitylist $sysutilslist $textproclist $wwwlist"
61 64
 
62 65
 # Add the build_alias env variable to listed ports
63 66
 for port in $portlist
... ...
@@ -68,7 +71,8 @@ done
68 71
 
69 72
 
70 73
 # List of ports that require an OpenBSD CMAKE_SYSTEM_NAME
71
-devellist="devel/cmocka"
74
+audiolist="audio/chromaprint"
75
+devellist="devel/cmocka devel/doxygen"
72 76
 
73 77
 portlist="$devellist"
74 78
 
... ...
@@ -87,6 +91,8 @@ lineadd "pre-configure:" "        @cp \${FILESDIR}/Platform/LibertyBSD.cmake \${
87 91
 dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
88 92
 lineadd "pre-configure:" "        @cp \${FILESDIR}/platforms/LibertyBSD.cmake \${WRKSRC}/cmake/platforms/LibertyBSD.cmake" devel/llvm/Makefile
89 93
 dircp files/ports/files/llvm/ devel/llvm/files/
94
+rep "-no-ssse3 -no-sse3" "-no-ssse3 -no-sse3 -platform openbsd-g++" x11/qt5/qtbase/Makefile
95
+rep "--enable-shared" "--enable-shared --target-os=openbsd" graphics/ffmpeg/Makefile
90 96
 
91 97
 # *.mk edits
92 98
 rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/perl.port.mk
... ...
@@ -98,11 +104,46 @@ lineadd "*:OpenBSD:*:*)" "        echo \${UNAME_MACHINE_ARCH}-unknown-openbsd\${
98 104
 lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'\`" infrastructure/db/config.guess
99 105
 
100 106
 # Problem childs:
101
-# * lang/python/2.7	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
107
+# * lang/python 	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
102 108
 # * lang/tcl
103 109
 # * x11/tk
104 110
 # * devel/llvm
105 111
 # * security/gnutls
112
+# * lang/ruby   	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
113
+# * gobject-introspection
114
+# * lang/mono   	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
115
+# * mozjs17	Need to figure out how to create a build_alias... the env var and config arg used in other ports doesn't work.
116
+# * multimedia/libvpx	"Toolchain unable to link executables"
117
+# * p5-Curses
118
+# * libproxy	ld issue
119
+# * x11/gtk\+3
120
+# * graphics/openjp2	ninja; ld issue
121
+# * devel/jdk/1.7
122
+# * audio/libsoxr	ninja; ...
123
+# * databases/mariadb
124
+# * multimedia/libv4l
125
+# * multimedia/x26[45] --host=${ARCH}-unknown-openbsd6.1
126
+# * graphics/ffmpeg	Unable to test cc.
127
+# * x11/qt4
128
+# * x11/qt5/qtbase
129
+# * x11/qt5/qtdeclarative
130
+# * x11/qt5/qttools
131
+# * gstreamer/plugins-base
132
+# * p5-Module-Build
133
+# * libmusicbrainz
134
+# * libmusicbrainz5
135
+# * bioperl
136
+# * lang/g77
137
+# * qtmultimedia
138
+# * qtdeclarative
139
+# * qtsvg
140
+# * audio/cantata
141
+
142
+# The recurring theme I'm noticing here is the 'cannot run C compiled programs' issue. If that's solved, everything else should be smooth
143
+# sailing....
144
+# Unfortunately some of the more important packages encounter this issue.
145
+
146
+# Note to self: gc*
106 147
 
107 148
 # Go through ports with additional patches for LBSD
108 149
 for category in files/ports/files/patches/*
... ...
@@ -130,6 +171,7 @@ rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README
130 171
 rep "ftp.openbsd.org" "ftp.libertybsd.net" sysutils/ruby-puppet/4/patches/patch-lib_puppet_provider_package-openbsd_rb
131 172
 rep "on OpenBSD" "on LibertyBSD" sysutils/sysmon/pkg/README ; rep "openbsd.org" "libertybsd.net" sysutils/sysmon/pkg/README
132 173
 rep "=\"OpenBSD " "=\"LibertyBSD " multimedia/gstreamer-0.10/Makefile.inc
174
+rep "openbsd.org" "libertybsd.net" multimedia/gstreamer-0.10/Makefile.inc
133 175
 # @jimmybot for this :) ^^
134 176
 
135 177
 apply
Browse code

Updated rebranding of ports

Jade Levesque authored on 2017-07-02 12:04:27
Showing 1 changed files
... ...
@@ -42,6 +42,7 @@ devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.6
42 42
 devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
43 43
 devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
44 44
 devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection devel/yasm"
45
+x11list="x11/gnome/at-spi2-core x11/gnome/at-spi2-atk"
45 46
 editorslist="editors/nano"
46 47
 gameslist="games/xscorch"
47 48
 graphicslist="graphics/cairo"
... ...
@@ -50,7 +51,7 @@ langlist="lang/ghc lang/clisp"
50 51
 maillist="mail/mutt mail/alpine"
51 52
 netlist="net/openvpn"
52 53
 printlist="print/libpaper"
53
-securitylist="security/cyrus-sasl2 security/libmcrypt"
54
+securitylist="security/cyrus-sasl2 security/libmcrypt security/libtasn1 security/p11-kit"
54 55
 shellslist="shells/bash"
55 56
 sysutilslist="sysutils/e2fsprogs"
56 57
 textproclist="textproc/groff"
... ...
@@ -84,6 +85,8 @@ rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unk
84 85
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
85 86
 lineadd "pre-configure:" "        @cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
86 87
 dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
88
+lineadd "pre-configure:" "        @cp \${FILESDIR}/platforms/LibertyBSD.cmake \${WRKSRC}/cmake/platforms/LibertyBSD.cmake" devel/llvm/Makefile
89
+dircp files/ports/files/llvm/ devel/llvm/files/
87 90
 
88 91
 # *.mk edits
89 92
 rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/perl.port.mk
... ...
@@ -98,6 +101,8 @@ lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'
98 101
 # * lang/python/2.7	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
99 102
 # * lang/tcl
100 103
 # * x11/tk
104
+# * devel/llvm
105
+# * security/gnutls
101 106
 
102 107
 # Go through ports with additional patches for LBSD
103 108
 for category in files/ports/files/patches/*
... ...
@@ -122,6 +127,9 @@ linedel "\$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso" emul
122 127
 rep "install52.fs" "install61.fs" emulators/qemu/pkg/README
123 128
 rep "install52.iso" "install61.iso" emulators/qemu/pkg/README
124 129
 rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README
125
-# @jimmybot for this ^^
130
+rep "ftp.openbsd.org" "ftp.libertybsd.net" sysutils/ruby-puppet/4/patches/patch-lib_puppet_provider_package-openbsd_rb
131
+rep "on OpenBSD" "on LibertyBSD" sysutils/sysmon/pkg/README ; rep "openbsd.org" "libertybsd.net" sysutils/sysmon/pkg/README
132
+rep "=\"OpenBSD " "=\"LibertyBSD " multimedia/gstreamer-0.10/Makefile.inc
133
+# @jimmybot for this :) ^^
126 134
 
127 135
 apply
Browse code

Added support for additional port patches in the tree

Jade Levesque authored on 2017-06-17 02:54:43
Showing 1 changed files
... ...
@@ -99,6 +99,21 @@ lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'
99 99
 # * lang/tcl
100 100
 # * x11/tk
101 101
 
102
+# Go through ports with additional patches for LBSD
103
+for category in files/ports/files/patches/*
104
+do
105
+	category_name="$(echo $category | sed 's^.*/^^')"
106
+	for port in $category
107
+	do
108
+		port_name="$(echo $port | sed 's^.*/^^')"
109
+		for patch in $port
110
+		do
111
+			patch_name="$(echo $patch | sed 's^.*/^^')"
112
+			filecp "files/ports/file/patches/$category_name/$port_name/$patch_name" "$category_name/$port_name/patches/$patch_name"
113
+		done
114
+	done
115
+done
116
+
102 117
 
103 118
 # Port-specific changes for rebranding
104 119
 rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd61.iso" emulators/qemu/pkg/README 
Browse code

Slight qemu fix

Jade Levesque authored on 2017-06-17 02:24:11
Showing 1 changed files
... ...
@@ -101,9 +101,12 @@ lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'
101 101
 
102 102
 
103 103
 # Port-specific changes for rebranding
104
-rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README # @jimmybot for these
105
-rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd61.iso" emulators/qemu/pkg/README
104
+rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd61.iso" emulators/qemu/pkg/README 
106 105
 rep "ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/amd64/cd61.iso" emulators/qemu/pkg/README
107 106
 linedel "\$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso" emulators/qemu/pkg/README
107
+rep "install52.fs" "install61.fs" emulators/qemu/pkg/README
108
+rep "install52.iso" "install61.iso" emulators/qemu/pkg/README
109
+rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README
110
+# @jimmybot for this ^^
108 111
 
109 112
 apply
Browse code

Qemu README rebranding-- @jimmybot

Jade Levesque authored on 2017-06-17 02:17:37
Showing 1 changed files
... ...
@@ -79,7 +79,7 @@ do
79 79
 done
80 80
 
81 81
 
82
-# Port-specific changes
82
+# Port-specific changes for build
83 83
 rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
84 84
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
85 85
 lineadd "pre-configure:" "        @cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
... ...
@@ -98,4 +98,12 @@ lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'
98 98
 # * lang/python/2.7	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
99 99
 # * lang/tcl
100 100
 # * x11/tk
101
+
102
+
103
+# Port-specific changes for rebranding
104
+rep "OpenBSD" "LibertyBSD" emulators/qemu/pkg/README # @jimmybot for these
105
+rep "ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/i386/cd61.iso" emulators/qemu/pkg/README
106
+rep "ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso" "ftp.libertybsd.net/pub/LibertyBSD/snapshots/amd64/cd61.iso" emulators/qemu/pkg/README
107
+linedel "\$ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso" emulators/qemu/pkg/README
108
+
101 109
 apply
Browse code

Started ports using cmake module

Jade Levesque authored on 2017-06-17 02:08:22
Showing 1 changed files
... ...
@@ -41,7 +41,7 @@ devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/aut
41 41
 devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.63 devel/autoconf/2.64 devel/autoconf/2.65 devel/autoconf/2.66 devel/autoconf/2.67 devel/autoconf/2.68"
42 42
 devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
43 43
 devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
44
-devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection"
44
+devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection devel/yasm"
45 45
 editorslist="editors/nano"
46 46
 gameslist="games/xscorch"
47 47
 graphicslist="graphics/cairo"
... ...
@@ -66,6 +66,19 @@ do
66 66
 done
67 67
 
68 68
 
69
+# List of ports that require an OpenBSD CMAKE_SYSTEM_NAME
70
+devellist="devel/cmocka"
71
+
72
+portlist="$devellist"
73
+
74
+# Add the -DCMAKE_SYSTEM_NAME argument to listed ports
75
+for port in $portlist
76
+do
77
+	rep ".include <bsd.port.mk>" "CONFIGURE_ARGS +=        -DCMAKE_SYSTEM_NAME=OpenBSD" $port/Makefile
78
+	lineadd  "CONFIGURE_ARGS +=        -DCMAKE_SYSTEM_NAME=OpenBSD" ".include <bsd.port.mk>" $port/Makefile
79
+done
80
+
81
+
69 82
 # Port-specific changes
70 83
 rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
71 84
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
Browse code

Fixed devel/cmake

Jade Levesque authored on 2017-06-14 04:51:08
Showing 1 changed files
... ...
@@ -30,7 +30,6 @@ else
30 30
         SRC_DIR=$1
31 31
 fi
32 32
 
33
-rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/perl.port.mk
34 33
 
35 34
 # List of ports that require an OBSD build_alias env var
36 35
 archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo archivers/xz"
... ...
@@ -42,9 +41,10 @@ devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/aut
42 41
 devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.63 devel/autoconf/2.64 devel/autoconf/2.65 devel/autoconf/2.66 devel/autoconf/2.67 devel/autoconf/2.68"
43 42
 devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
44 43
 devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
45
-devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall"
44
+devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall devel/gobject-introspection"
46 45
 editorslist="editors/nano"
47 46
 gameslist="games/xscorch"
47
+graphicslist="graphics/cairo"
48 48
 geolist="geo/spatialindex"
49 49
 langlist="lang/ghc lang/clisp"
50 50
 maillist="mail/mutt mail/alpine"
... ...
@@ -69,9 +69,11 @@ done
69 69
 # Port-specific changes
70 70
 rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
71 71
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
72
-lineadd "pre-configure:" "        cp -r \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
73
-dircp files/ports/files/Platform devel/cmake/files/Platform
72
+lineadd "pre-configure:" "        @cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
73
+dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
74 74
 
75
+# *.mk edits
76
+rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/perl.port.mk
75 77
 
76 78
 # Misc. infrastructure edits
77 79
 lineadd "*:OpenBSD:*:*)" "*:LibertyBSD:*:*)" infrastructure/db/config.guess
... ...
@@ -81,4 +83,6 @@ lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'
81 83
 
82 84
 # Problem childs:
83 85
 # * lang/python/2.7	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
86
+# * lang/tcl
87
+# * x11/tk
84 88
 apply
Browse code

More ports added to lists, general cleanup & simplification

Jade Levesque authored on 2017-06-12 22:26:20
Showing 1 changed files
... ...
@@ -32,56 +32,53 @@ fi
32 32
 
33 33
 rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/perl.port.mk
34 34
 
35
-# The ones that require build_alias
36
-archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo"
35
+# List of ports that require an OBSD build_alias env var
36
+archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo archivers/xz"
37 37
 archiverslist="$archiverslsit archivers/lzop archivers/par2cmdline"
38 38
 audiolist="audio/freealut"
39
-dabataseslist="databases/db/v3 databases/db/v4 databases/openldap"
39
+converterslist="converters/libiconv"
40
+dabataseslist="databases/db/v3 databases/db/v4 databases/openldap databases/sqlite3 databases/gdbm"
40 41
 devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/autoconf/2.56 devel/autoconf/2.57 devel/autoconf/2.58 devel/autoconf/2.59 devel/autoconf/2.60"
41 42
 devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.63 devel/autoconf/2.64 devel/autoconf/2.65 devel/autoconf/2.66 devel/autoconf/2.67 devel/autoconf/2.68"
42 43
 devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
43 44
 devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
44
-devellist="$devellist devel/bison"
45
+devellist="$devellist devel/bison devel/gettext devel/gettext-tools devel/libsigsegv devel/ffcall"
45 46
 editorslist="editors/nano"
46 47
 gameslist="games/xscorch"
47 48
 geolist="geo/spatialindex"
48
-langlist="lang/ghc"
49
+langlist="lang/ghc lang/clisp"
49 50
 maillist="mail/mutt mail/alpine"
50 51
 netlist="net/openvpn"
52
+printlist="print/libpaper"
51 53
 securitylist="security/cyrus-sasl2 security/libmcrypt"
54
+shellslist="shells/bash"
52 55
 sysutilslist="sysutils/e2fsprogs"
53 56
 textproclist="textproc/groff"
54 57
 wwwlist="www/lynx www/apache-httpd"
55 58
 
56 59
 portlist="$archiverslist $audiolist $databaseslist $devellist $editorslist $gameslist $geolist $langlist $maillist $netlist $securitylist $sysutilslist $textproclist $wwwlist"
57 60
 
61
+# Add the build_alias env variable to listed ports
58 62
 for port in $portlist
59 63
 do
60 64
 	rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd6.1\"" $port/Makefile
61 65
 	lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd6.1\"" ".include <bsd.port.mk>" $port/Makefile
62 66
 done
63 67
 
68
+
69
+# Port-specific changes
64 70
 rep ".include <bsd.port.mk>" "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" lang/ghc/Makefile
65 71
 lineadd  "CONFIGURE_ENV +=        build_alias=\"\${ARCH}-unknown-openbsd\"" ".include <bsd.port.mk>" lang/ghc/Makefile
72
+lineadd "pre-configure:" "        cp -r \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
73
+dircp files/ports/files/Platform devel/cmake/files/Platform
66 74
 
67 75
 
68
-devellist="devel/cmake"
69
-portlist="$audiolist"
70
-for port in $portlist
71
-do
72
-	if grep "pre-configre:" $SRC_DIR/$port/Makefile
73
-	then
74
-		lineadd "pre-configure:" "        cp -r \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" $port/Makefile
75
-	else
76
-		rep ".include <bsd.port.mk>" "pre-configure:" $port/Makefile
77
-		lineadd "pre-configure:" "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" $port/Makefile
78
-		lineadd "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" ".include <bsd.port.mk>" $port/Makefile
79
-	fi
80
-	dircp files/ports/files/Platform $port/files/Platform
81
-done
82
-
83
-# Installing files
84
-dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
85
-lineadd "pre-configure:" "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
76
+# Misc. infrastructure edits
77
+lineadd "*:OpenBSD:*:*)" "*:LibertyBSD:*:*)" infrastructure/db/config.guess
78
+lineadd "*:OpenBSD:*:*)" "        exit ;;" infrastructure/db/config.guess
79
+lineadd "*:OpenBSD:*:*)" "        echo \${UNAME_MACHINE_ARCH}-unknown-openbsd\${UNAME_RELEASE}" infrastructure/db/config.guess
80
+lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/^.*BSD\.//'\`" infrastructure/db/config.guess
86 81
 
82
+# Problem childs:
83
+# * lang/python/2.7	"configure: error: cannot run C compiled programs."	It configures just fine (using same args as used when configuring in ports) manually, but not using port.
87 84
 apply
Browse code

Fix port_rebrand

Jade Levesque authored on 2017-06-08 05:51:11
Showing 1 changed files
... ...
@@ -34,7 +34,7 @@ rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/p
34 34
 
35 35
 # The ones that require build_alias
36 36
 archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo"
37
-archiverslist=$archiverslsit archivers/lzop archivers/par2cmdline"
37
+archiverslist="$archiverslsit archivers/lzop archivers/par2cmdline"
38 38
 audiolist="audio/freealut"
39 39
 dabataseslist="databases/db/v3 databases/db/v4 databases/openldap"
40 40
 devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/autoconf/2.56 devel/autoconf/2.57 devel/autoconf/2.58 devel/autoconf/2.59 devel/autoconf/2.60"
... ...
@@ -50,11 +50,10 @@ maillist="mail/mutt mail/alpine"
50 50
 netlist="net/openvpn"
51 51
 securitylist="security/cyrus-sasl2 security/libmcrypt"
52 52
 sysutilslist="sysutils/e2fsprogs"
53
-texproclist="textproc/groff"
53
+textproclist="textproc/groff"
54 54
 wwwlist="www/lynx www/apache-httpd"
55
-libsigsegv
56 55
 
57
-portlist="$wwwlist"
56
+portlist="$archiverslist $audiolist $databaseslist $devellist $editorslist $gameslist $geolist $langlist $maillist $netlist $securitylist $sysutilslist $textproclist $wwwlist"
58 57
 
59 58
 for port in $portlist
60 59
 do
... ...
@@ -72,15 +71,17 @@ for port in $portlist
72 71
 do
73 72
 	if grep "pre-configre:" $SRC_DIR/$port/Makefile
74 73
 	then
75
-		lineadd "pre-configure:" "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" $port/Makefile
74
+		lineadd "pre-configure:" "        cp -r \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" $port/Makefile
76 75
 	else
77 76
 		rep ".include <bsd.port.mk>" "pre-configure:" $port/Makefile
78 77
 		lineadd "pre-configure:" "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" $port/Makefile
79 78
 		lineadd "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" ".include <bsd.port.mk>" $port/Makefile
80 79
 	fi
81
-	filecp files/ports/files/Platform $port/files/Platform
80
+	dircp files/ports/files/Platform $port/files/Platform
82 81
 done
83 82
 
84 83
 # Installing files
85
-filecp files/ports/files/cmake/Platform devel/cmake/files/Platform
84
+dircp files/ports/files/cmake/Platform devel/cmake/files/Platform
86 85
 lineadd "pre-configure:" "        cp \${FILESDIR}/Platform/LibertyBSD.cmake \${WRKSRC}/Modules/Platform/LibertyBSD.cmake" devel/cmake/Makefile
86
+
87
+apply
Browse code

Progress

Jade Levesque authored on 2017-06-06 06:24:21
Showing 1 changed files
... ...
@@ -36,17 +36,23 @@ rep "\${MACHINE-ARCH}-openbsd" "\${MACHINE-ARCH}-libertybsd" infrastructure/mk/p
36 36
 archiverslist="archivers/libzip archivers/gcab archivers/gcpio archivers/gshar+gunshar archivers/gtar archivers/libarchive archivers/libmspack archivers/libtar archivers/lzo"
37 37
 archiverslist=$archiverslsit archivers/lzop archivers/par2cmdline"
38 38
 audiolist="audio/freealut"
39
-dabataseslist="databases/db/v3 databases/db/v4"
39
+dabataseslist="databases/db/v3 databases/db/v4 databases/openldap"
40 40
 devellist="devel/autoconf/2.13 devel/autoconf/2.52 devel/autoconf/2.54 devel/autoconf/2.56 devel/autoconf/2.57 devel/autoconf/2.58 devel/autoconf/2.59 devel/autoconf/2.60"
41 41
 devellist="$devellist devel/autoconf/2.61 devel/autoconf/2.62 devel/autoconf/2.63 devel/autoconf/2.64 devel/autoconf/2.65 devel/autoconf/2.66 devel/autoconf/2.67 devel/autoconf/2.68"
42 42
 devellist="$devllist devel/autoconf/2.69 devel/automake/1.4 devel/automake/1.8 devel/automake/1.9 devel/automake/1.10 devel/automake/1.11 devel/automake/1.12 devel/automake/1.13"
43 43
 devellist="$devellist devel/automake/1.14 devel/automake/1.15 devel/libtool devel/libidn devel/gmake devel/llvm devel/sdl2-image devel/sdl2 devel/apr devel/apr-util devel/t1lib"
44
+devellist="$devellist devel/bison"
45
+editorslist="editors/nano"
44 46
 gameslist="games/xscorch"
45 47
 geolist="geo/spatialindex"
46 48
 langlist="lang/ghc"
47
-maillist="mail/mutt"
49
+maillist="mail/mutt mail/alpine"
50
+netlist="net/openvpn"
51
+securitylist="security/cyrus-sasl2 security/libmcrypt"
52
+sysutilslist="sysutils/e2fsprogs"
48 53
 texproclist="textproc/groff"
49 54
 wwwlist="www/lynx www/apache-httpd"
55
+libsigsegv
50 56
 
51 57
 portlist="$wwwlist"
52 58
 
Browse code

Starting patching ports so they build on LBSD

Jade Levesque authored on 2017-06-05 07:56:07
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,80 @@
1
+#!/bin/ksh
2
+