- Fix build with ia64 [1]

- Remove 4.X gruft
- Respect X11BASE
- s/INSTALLS_SHLIB/USE_LDCONFIG

PR:	        112016
Submitted by:	Peter Hofer <ph@desktopbsd.net> (maintainer)

3 files changed, 61 insertions, 5 deletions

diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile
index 68f96a919709..dd00e9bfa3ea 100644
--- a/sysutils/desktopbsd-tools/Makefile
+++ b/sysutils/desktopbsd-tools/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm \
 		portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \
 		portaudit:${PORTSDIR}/ports-mgmt/portaudit
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 
@@ -32,10 +32,6 @@ DATADIR=	${PREFIX}/share/desktopbsd
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		requires FreeBSD 5 or newer
-.endif
-
 .if ${OSVERSION} < 601101 || ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700015 )
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
@@ -44,6 +40,11 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	portsnap:${PORTSDIR}/ports-mgmt/portsnap
 .endif
 
+post-extract:
+.for f in ${X11R6_FILES}
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/${f}
+.endfor
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		"/Installation/d; /Documentation/d; /InitialConf/d" \
diff --git a/sysutils/desktopbsd-tools/files/patch-libdbsddisk_libdbsddisk.pro b/sysutils/desktopbsd-tools/files/patch-libdbsddisk_libdbsddisk.pro
new file mode 100644
index 000000000000..77a99ae2eead
--- /dev/null
+++ b/sysutils/desktopbsd-tools/files/patch-libdbsddisk_libdbsddisk.pro
@@ -0,0 +1,44 @@
+--- libdbsddisk/libdbsddisk.orig	Sat Nov 18 16:46:03 2006
++++ libdbsddisk/libdbsddisk.pro	Sat Nov 18 16:44:21 2006
+@@ -23,38 +23,12 @@
+            chunk.c \
+            create_chunk.c \
+            disk.c \
+-           open_disk.c \
+            rules.c \
++           write_$${ARCH}_disk.c \
+            write_disk.c
+ 
+ equals(ARCH, ia64) {
+-	SOURCES += open_ia64_disk.c \
+-              write_ia64_disk.c
++	SOURCES += open_ia64_disk.c
+ } else {
+-	SOURCES += change.c
+-}
+-
+-equals(ARCH, alpha) {
+-   SOURCES += write_alpha_disk.c
+-}
+-
+-equals(ARCH, amd64) {
+-   SOURCES += write_amd64_disk.c
+-}
+-
+-equals(ARCH, sparc64) {
+-	SOURCES += write_sparc64_disk.c
+-}
+-           
+-equals(ARCH, i386) {
+-	SOURCES += write_i386_disk.c
+-}
+-
+-equals(ARCH, pc98) {
+-	SOURCES += write_pc98_disk.c
+-	DEFINES += PC98
+-}
+-
+-equals(ARCH, powerpc) {
+-	SOURCES += write_powerpc_disk.c
++	SOURCES += open_disk.c change.c
+ }
diff --git a/sysutils/desktopbsd-tools/files/patch-prepare-build.sh b/sysutils/desktopbsd-tools/files/patch-prepare-build.sh
new file mode 100644
index 000000000000..204cd2b3f5d7
--- /dev/null
+++ b/sysutils/desktopbsd-tools/files/patch-prepare-build.sh
@@ -0,0 +1,11 @@
+--- prepare_build.sh.orig	Sat Aug  5 02:17:22 2006
++++ prepare_build.sh	Sun Apr 22 18:10:44 2007
+@@ -2,7 +2,7 @@
+ # Run scripts that prepare for the build
+ 
+ printf "Compiling translation files..."
+-(cd Translation ; ./pro-generate.sh && lrelease Translation.pro) || (echo "Error compiling translation files" ; exit 1)
++(cd Translation ; ./pro-generate.sh && ${QTDIR}/bin/lrelease Translation.pro) || (echo "Error compiling translation files" ; exit 1)
+ echo "Done."
+ 
+ printf "Generating IDL for hardware notification..."