diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-11-04 16:17:37 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-11-04 16:17:37 +0100 |
| commit | 2a16ca8d11341c87f04d6eb60e5fc3107a92ee6b (patch) | |
| tree | 518fdf18fd79fa3b797c8d58d4cde2bb270ce473 | |
| parent | affc61199480e36a509f987103e10694be8735e9 (diff) | |
x11/fvwm-obsd: fix installation of the modules
| -rw-r--r-- | x11/fvwm-obsd/Makefile | 1 | ||||
| -rw-r--r-- | x11/fvwm-obsd/patches/patch-fvwm_Makefile | 11 | ||||
| -rw-r--r-- | x11/fvwm-obsd/patches/patch-utils_Makefile | 11 | ||||
| -rw-r--r-- | x11/fvwm-obsd/pkg/PLIST | 36 |
4 files changed, 39 insertions, 20 deletions
diff --git a/x11/fvwm-obsd/Makefile b/x11/fvwm-obsd/Makefile index 2495ffd..fdc86d6 100644 --- a/x11/fvwm-obsd/Makefile +++ b/x11/fvwm-obsd/Makefile @@ -26,7 +26,6 @@ WRKDIST = ${WRKDIR}/fvwm FAKE_FLAGS = PREFIX=${TRUEPREFIX} MANPREFIX=${TRUEPREFIX}/man \ INSTALL_DATA="${INSTALL_DATA}" \ - BINDIR=${PREFIX}/bin \ INCSDIR=${PREFIX}/include \ FVWMLIBDIR=${PREFIX}/lib/X11/fvwm diff --git a/x11/fvwm-obsd/patches/patch-fvwm_Makefile b/x11/fvwm-obsd/patches/patch-fvwm_Makefile new file mode 100644 index 0000000..0815b2c --- /dev/null +++ b/x11/fvwm-obsd/patches/patch-fvwm_Makefile @@ -0,0 +1,11 @@ +Index: fvwm/Makefile +--- fvwm/Makefile.orig ++++ fvwm/Makefile +@@ -21,5 +21,7 @@ fvwm.1: fvwm2.1 + + CLEANFILES= fvwm.1 + ++BINDIR= ${PREFIX}/bin ++ + .include <bsd.prog.mk> + .include <bsd.xorg.mk> diff --git a/x11/fvwm-obsd/patches/patch-utils_Makefile b/x11/fvwm-obsd/patches/patch-utils_Makefile new file mode 100644 index 0000000..d88b572 --- /dev/null +++ b/x11/fvwm-obsd/patches/patch-utils_Makefile @@ -0,0 +1,11 @@ +Index: utils/Makefile +--- utils/Makefile.orig ++++ utils/Makefile +@@ -9,5 +9,7 @@ SRCS= xpmroot.c + + LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 -lxcb -lXdmcp -lXau + ++BINDIR= ${PREFIX}/bin ++ + .include <bsd.prog.mk> + .include <bsd.xorg.mk> diff --git a/x11/fvwm-obsd/pkg/PLIST b/x11/fvwm-obsd/pkg/PLIST index a2b9c8b..a2a78ad 100644 --- a/x11/fvwm-obsd/pkg/PLIST +++ b/x11/fvwm-obsd/pkg/PLIST @@ -1,20 +1,3 @@ -@bin bin/FvwmAuto -@bin bin/FvwmBacker -@bin bin/FvwmBanner -@bin bin/FvwmButtons -@bin bin/FvwmCpp -@bin bin/FvwmForm -@bin bin/FvwmIconBox -@bin bin/FvwmIconMan -@bin bin/FvwmIdent -@bin bin/FvwmM4 -@bin bin/FvwmPager -@bin bin/FvwmRearrange -@bin bin/FvwmSave -@bin bin/FvwmSaveDesk -@bin bin/FvwmScroll -@bin bin/FvwmTalk -@bin bin/FvwmWinList @bin bin/fvwm @bin bin/xpmroot include/X11/bitmaps/ccode.icon @@ -154,9 +137,24 @@ include/X11/pixmaps/xterm-sun.xpm include/X11/pixmaps/xterm.xpm include/X11/pixmaps/xv.xpm include/X11/pixmaps/xv2.xpm -include/bitmaps/ -include/pixmaps/ lib/X11/fvwm/.fvwmrc +@bin lib/X11/fvwm/FvwmAuto +@bin lib/X11/fvwm/FvwmBacker +@bin lib/X11/fvwm/FvwmBanner +@bin lib/X11/fvwm/FvwmButtons +@bin lib/X11/fvwm/FvwmCpp +@bin lib/X11/fvwm/FvwmForm +@bin lib/X11/fvwm/FvwmIconBox +@bin lib/X11/fvwm/FvwmIconMan +@bin lib/X11/fvwm/FvwmIdent +@bin lib/X11/fvwm/FvwmM4 +@bin lib/X11/fvwm/FvwmPager +@bin lib/X11/fvwm/FvwmRearrange +@bin lib/X11/fvwm/FvwmSave +@bin lib/X11/fvwm/FvwmSaveDesk +@bin lib/X11/fvwm/FvwmScroll +@bin lib/X11/fvwm/FvwmTalk +@bin lib/X11/fvwm/FvwmWinList lib/X11/fvwm/decor_examples lib/X11/fvwm/new-features lib/X11/fvwm/system.fvwm2rc |