--- Makefile.inc.orig	Sat Dec 15 14:10:40 2007
+++ Makefile.inc	Sat Dec 15 14:11:21 2007
@@ -10,8 +10,8 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITE_FEDORA=http://download.fedora.redhat.com/pub/fedora/linux/core/ \
-	ftp://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core/
+MASTER_SITE_FEDORA=http://download.fedora.redhat.com/pub/fedora/linux/ \
+	ftp://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/
 
 DIST_SUBDIR=	rpm
 EXTRACT_ONLY=
--- base/Makefile.orig	Sat Dec 15 14:11:31 2007
+++ base/Makefile	Sat Dec 15 15:32:25 2007
@@ -2,7 +2,7 @@
 
 COMMENT=	Linux compatibility package based on Fedora Core 4
 
-PKGNAME=	fedora_base-4.0p3
+PKGNAME=	fedora_base-4.0p4
 # clean up after make plist:
 #	- perl -pi -e "s,^\@lib ,," pkg/PLIST
 #	- change the 2nd LIBXaw_version to LIBXaw7_version in pkg/PLIST
@@ -59,8 +59,9 @@
 
 MAINTAINER=	Nikolay Sturm <sturm@openbsd.org>
 
-MASTER_SITES=	${MASTER_SITE_FEDORA:=4/i386/os/Fedora/RPMS/}
-MASTER_SITES0=	${MASTER_SITE_FEDORA:=updates/4/i386/}
+MASTER_SITES=	${MASTER_SITE_FEDORA:=core/4/i386/os/Fedora/RPMS/}
+MASTER_SITES0=	${MASTER_SITE_FEDORA:=core/updates/4/i386/}
+MASTER_SITES1=	${MASTER_SITE_FEDORA:=extras/4/i386/}
 
 DISTFILES=	${RPMS}
 
@@ -89,6 +90,7 @@
 		libgcc-4.0.2-8.fc4.i386.rpm:0 \
 		libjpeg-6b-34.i386.rpm \
 		libpng-1.2.8-2.i386.rpm \
+		libsigc++20-2.0.17-1.i386.rpm:1 \
 		libstdc++-4.0.2-8.fc4.i386.rpm:0 \
 		libtermcap-2.0.8-41.i386.rpm \
 		libtiff-3.7.1-6.fc4.3.i386.rpm:0 \
@@ -108,7 +110,7 @@
 
 do-install:
 	${INSTALL_DATA_DIR} ${FEDORADIR}
-.for rpm in ${RPMS:S/:0//}
+.for rpm in ${RPMS:S/:0//:S/:1//}
 	cd ${FEDORADIR}; rpm2cpio ${RPMDIR}/${rpm} | gcpio -idm --quiet
 .endfor
 # fix gcpio -d creating dirs with mode 700
--- base/distinfo.orig	Sat Dec 15 14:34:24 2007
+++ base/distinfo	Sat Dec 15 14:38:23 2007
@@ -19,6 +19,7 @@
 MD5 (rpm/libgcc-4.0.2-8.fc4.i386.rpm) = ACQEa+im5GkMoIHlzyyycg==
 MD5 (rpm/libjpeg-6b-34.i386.rpm) = F9lwzMVYLiAXQDw/Bzc+fQ==
 MD5 (rpm/libpng-1.2.8-2.i386.rpm) = twr/OiLRaSJSATHkNzhmog==
+MD5 (rpm/libsigc++20-2.0.17-1.i386.rpm) = da7FDI1A1WfCB2oHpgGMsg==
 MD5 (rpm/libstdc++-4.0.2-8.fc4.i386.rpm) = ckCfTx75s5pzBibeheTbsA==
 MD5 (rpm/libtermcap-2.0.8-41.i386.rpm) = h09gUe0yUxHhdMWj2RX8SA==
 MD5 (rpm/libtiff-3.7.1-6.fc4.3.i386.rpm) = aajVCZgJkOB2tFzpOTBBtg==
@@ -50,6 +51,7 @@
 RMD160 (rpm/libgcc-4.0.2-8.fc4.i386.rpm) = fOVrfWQxKPQOGWbFnsDQuwjP8iE=
 RMD160 (rpm/libjpeg-6b-34.i386.rpm) = y5vBgr0ZL1tEAurYGI1VMhqUoBk=
 RMD160 (rpm/libpng-1.2.8-2.i386.rpm) = 4vU4fsXpcONlaVZf0TQUvvftQFI=
+RMD160 (rpm/libsigc++20-2.0.17-1.i386.rpm) = NHt6ZG5jpgPVUTUUV+R/AxvYEiM=
 RMD160 (rpm/libstdc++-4.0.2-8.fc4.i386.rpm) = u1nNdtWkGvFl2DBcamj5RuaNM4Q=
 RMD160 (rpm/libtermcap-2.0.8-41.i386.rpm) = KB0VI3T4ajoQ6oIjZHHb3LfXMUU=
 RMD160 (rpm/libtiff-3.7.1-6.fc4.3.i386.rpm) = OrZfNPCXx9crmUG4wjHxX+N/ug4=
@@ -81,6 +83,7 @@
 SHA1 (rpm/libgcc-4.0.2-8.fc4.i386.rpm) = fmn0zaJvaL6pzVrMm4IwiXZ3ucc=
 SHA1 (rpm/libjpeg-6b-34.i386.rpm) = Vx9nN6TxS3FfV0fsSVla2ojgYuw=
 SHA1 (rpm/libpng-1.2.8-2.i386.rpm) = tA1WGmGAlMFv+L3/JPfxh+ahqas=
+SHA1 (rpm/libsigc++20-2.0.17-1.i386.rpm) = Ol+bIzt/tGp257+Ddvv2DlLUag0=
 SHA1 (rpm/libstdc++-4.0.2-8.fc4.i386.rpm) = wD9Bzi7euUnsQ99qubQGgOkjD5M=
 SHA1 (rpm/libtermcap-2.0.8-41.i386.rpm) = qITF4z8ScYHuH4L1ATcJKiRrmwY=
 SHA1 (rpm/libtiff-3.7.1-6.fc4.3.i386.rpm) = Etz7DCqVnZ2n9YG0wbk6yghhVn0=
@@ -112,6 +115,7 @@
 SHA256 (rpm/libgcc-4.0.2-8.fc4.i386.rpm) = Vl6HHxW5hoLOkgLPynLSKwESMTfBB/wpjXXl81gTcfU=
 SHA256 (rpm/libjpeg-6b-34.i386.rpm) = 6iC6X7ZA1/cW/zha6aF6P0n7yy/whbWtUjx4hRBgtxI=
 SHA256 (rpm/libpng-1.2.8-2.i386.rpm) = 5yr2emRVA+GIQpkwj0Emjr/2rhWAweu0Fup8PhSB36Q=
+SHA256 (rpm/libsigc++20-2.0.17-1.i386.rpm) = d5lyBRVxRg6DSeM2gaGTPlpyvodP09UOHHGjewu4TAs=
 SHA256 (rpm/libstdc++-4.0.2-8.fc4.i386.rpm) = LCGJzHkW0tA914QmGYtNyjQbOtsjWwluCV2piYC2Zos=
 SHA256 (rpm/libtermcap-2.0.8-41.i386.rpm) = s1/NzqKTy3yVAij8phrKxTnGFqfaxpar9okyhV6K5zA=
 SHA256 (rpm/libtiff-3.7.1-6.fc4.3.i386.rpm) = /rJ5vNP/aI9s8xM6LBXnEuSf8q5ZmC1ov2+NzOzYvEU=
@@ -143,6 +147,7 @@
 SIZE (rpm/libgcc-4.0.2-8.fc4.i386.rpm) = 61139
 SIZE (rpm/libjpeg-6b-34.i386.rpm) = 132313
 SIZE (rpm/libpng-1.2.8-2.i386.rpm) = 160855
+SIZE (rpm/libsigc++20-2.0.17-1.i386.rpm) = 51328
 SIZE (rpm/libstdc++-4.0.2-8.fc4.i386.rpm) = 314331
 SIZE (rpm/libtermcap-2.0.8-41.i386.rpm) = 12859
 SIZE (rpm/libtiff-3.7.1-6.fc4.3.i386.rpm) = 307266
--- base/pkg/PLIST.orig	Sat Dec 15 15:35:09 2007
+++ base/pkg/PLIST	Sat Dec 15 15:38:41 2007
@@ -926,6 +926,8 @@
 emul/fedora/usr/lib/libpng12.so.0.1.2.8
 emul/fedora/usr/lib/libreadline.so.5
 emul/fedora/usr/lib/libreadline.so.${LIBreadline_VERSION}
+emul/fedora/usr/lib/libsigc-2.0.so.0
+emul/fedora/usr/lib/libsigc-2.0.so.0.0.0
 emul/fedora/usr/lib/libstdc++-2-libc6.1-1-2.9.0.so
 emul/fedora/usr/lib/libstdc++-3-libc6.2-2-2.10.0.so
 emul/fedora/usr/lib/libstdc++-libc6.2-2.so.3