diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-12-15 11:18:05 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-12-15 11:18:05 +0800 |
| commit | 2bd9ef29514ca36478b79689ed04f1873bf3b615 (patch) | |
| tree | 2b5de75cc8e1afdebb9d054a63a907d70abf7de3 /devel | |
| parent | 72686bebf59eb3c7db8fb30b272a0bb231faa917 (diff) | |
| download | marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.tar marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.tar.gz marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.tar.bz2 marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.tar.lz marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.tar.xz marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.tar.zst marcuscom-ports-2bd9ef29514ca36478b79689ed04f1873bf3b615.zip | |
Fix build on 6.X and higher.
Submitted by: mux
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5296 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgtop2/Makefile | 5 | ||||
| -rw-r--r-- | devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in (renamed from devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in) | 0 | ||||
| -rw-r--r-- | devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in | 38 |
3 files changed, 42 insertions, 1 deletions
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index f0abd0635..082833d65 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD: ports/devel/libgtop2/Makefile,v 1.96 2005/11/29 23:49:42 marcus Exp $ -# $MCom: ports/devel/libgtop2/Makefile,v 1.49 2005/09/05 19:23:42 ahze Exp $ +# $MCom: ports/devel/libgtop2/Makefile,v 1.51 2005/12/15 00:13:23 marcus Exp $ # PORTNAME= libgtop2 @@ -36,6 +36,9 @@ INFO= libgtop2 .if ${OSVERSION} >= 600000 PKGMESSAGE= ${FILESDIR}/pkg-message +EXTRA_PATCHES+= ${FILESDIR}/extra-67-patch-sysdeps_freebsd_Makefile.in +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-45-patch-sysdeps_freebsd_Makefile.in .endif post-patch: diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in index 08dfe60ff..08dfe60ff 100644 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in +++ b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in new file mode 100644 index 000000000..fc8c213bf --- /dev/null +++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,38 @@ +--- sysdeps/freebsd/Makefile.in.orig Thu Dec 15 02:19:13 2005 ++++ sysdeps/freebsd/Makefile.in Thu Dec 15 02:22:49 2005 +@@ -50,15 +50,15 @@ + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libgtop_sysdeps_2_0_la_LIBADD = ++libgtop_sysdeps_2_0_la_LIBADD = -lgeom -ldevstat + am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo + libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS) +-libgtop_sysdeps_suid_2_0_la_LIBADD = ++libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat + am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo \ + mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo \ + msg_limits.lo sem_limits.lo proclist.lo procstate.lo \ + procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \ +- procsegment.lo procargs.lo procmap.lo netlist.lo netload.lo \ ++ procsegment.lo procargs.lo procmap.lo sysinfo.lo netlist.lo netload.lo \ + ppp.lo procopenfiles.lo fsusage.lo + libgtop_sysdeps_suid_2_0_la_OBJECTS = \ + $(am_libgtop_sysdeps_suid_2_0_la_OBJECTS) +@@ -263,7 +263,7 @@ + sem_limits.c proclist.c procstate.c procuid.c \ + proctime.c procmem.c procsignal.c prockernel.c \ + procsegment.c procargs.c procmap.c netlist.c \ +- netload.c ppp.c procopenfiles.c fsusage.c ++ netload.c ppp.c procopenfiles.c sysinfo.c fsusage.c + + libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ +@@ -330,6 +330,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_limits.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ |